diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b69a8e2d5..0f2cb2b1ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,128 +1,122 @@
 # Changelog
 
-## [3.2.0-nightly.5](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.3.0-nightly.9](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
-[Full Changelog](https://github.com/pypeclub/OpenPype/compare/2.18.4...HEAD)
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.2.0...HEAD)
 
 **🚀 Enhancements**
 
+- submodules: avalon-core update [\#1911](https://github.com/pypeclub/OpenPype/pull/1911)
+- Feature AE local render [\#1901](https://github.com/pypeclub/OpenPype/pull/1901)
+- Ftrack: Where I run action enhancement [\#1900](https://github.com/pypeclub/OpenPype/pull/1900)
+- Ftrack: Private project server actions [\#1899](https://github.com/pypeclub/OpenPype/pull/1899)
+- Support nested studio plugins paths. [\#1898](https://github.com/pypeclub/OpenPype/pull/1898)
+- Settings: global validators with options [\#1892](https://github.com/pypeclub/OpenPype/pull/1892)
+- Settings: Conditional dict enum positioning [\#1891](https://github.com/pypeclub/OpenPype/pull/1891)
+- Expose stop timer through rest api. [\#1886](https://github.com/pypeclub/OpenPype/pull/1886)
+- TVPaint: Increment workfile [\#1885](https://github.com/pypeclub/OpenPype/pull/1885)
+- Allow Multiple Notes to run on tasks. [\#1882](https://github.com/pypeclub/OpenPype/pull/1882)
+- Prepare for pyside2 [\#1869](https://github.com/pypeclub/OpenPype/pull/1869)
+- Filter hosts in settings host-enum [\#1868](https://github.com/pypeclub/OpenPype/pull/1868)
+- Local actions with process identifier [\#1867](https://github.com/pypeclub/OpenPype/pull/1867)
+- Workfile tool start at host launch support [\#1865](https://github.com/pypeclub/OpenPype/pull/1865)
+- Anatomy schema validation [\#1864](https://github.com/pypeclub/OpenPype/pull/1864)
+- Ftrack prepare project structure [\#1861](https://github.com/pypeclub/OpenPype/pull/1861)
+- Independent general environments [\#1853](https://github.com/pypeclub/OpenPype/pull/1853)
+- TVPaint Start Frame [\#1844](https://github.com/pypeclub/OpenPype/pull/1844)
+- Ftrack push attributes action adds traceback to job [\#1843](https://github.com/pypeclub/OpenPype/pull/1843)
+- Prepare project action enhance [\#1838](https://github.com/pypeclub/OpenPype/pull/1838)
+- Standalone Publish of textures family [\#1834](https://github.com/pypeclub/OpenPype/pull/1834)
+- nuke: settings create missing default subsets [\#1829](https://github.com/pypeclub/OpenPype/pull/1829)
+- Update poetry lock [\#1823](https://github.com/pypeclub/OpenPype/pull/1823)
+- Settings: settings for plugins [\#1819](https://github.com/pypeclub/OpenPype/pull/1819)
+- Settings list can use template or schema as object type [\#1815](https://github.com/pypeclub/OpenPype/pull/1815)
+- Maya: Deadline custom settings  [\#1797](https://github.com/pypeclub/OpenPype/pull/1797)
+- Maya: Shader name validation [\#1762](https://github.com/pypeclub/OpenPype/pull/1762)
+
+**🐛 Bug fixes**
+
+- Nuke: update video file crassing [\#1916](https://github.com/pypeclub/OpenPype/pull/1916)
+- Fix - texture validators for workfiles triggers only for textures workfiles [\#1914](https://github.com/pypeclub/OpenPype/pull/1914)
+- Settings UI: List order works as expected [\#1906](https://github.com/pypeclub/OpenPype/pull/1906)
+- Hiero: loaded clip was not set colorspace from version data [\#1904](https://github.com/pypeclub/OpenPype/pull/1904)
+- Pyblish UI: Fix collecting stage processing [\#1903](https://github.com/pypeclub/OpenPype/pull/1903)
+- Burnins: Use input's bitrate in h624 [\#1902](https://github.com/pypeclub/OpenPype/pull/1902)
+- Bug: fixed python detection [\#1893](https://github.com/pypeclub/OpenPype/pull/1893)
+- global: integrate name missing default template [\#1890](https://github.com/pypeclub/OpenPype/pull/1890)
+- publisher: editorial plugins fixes [\#1889](https://github.com/pypeclub/OpenPype/pull/1889)
+- Normalize path returned from Workfiles. [\#1880](https://github.com/pypeclub/OpenPype/pull/1880)
+- Workfiles tool event arguments fix [\#1862](https://github.com/pypeclub/OpenPype/pull/1862)
+- imageio: fix grouping  [\#1856](https://github.com/pypeclub/OpenPype/pull/1856)
+- publisher: missing version in subset prop [\#1849](https://github.com/pypeclub/OpenPype/pull/1849)
+- Ftrack type error fix in sync to avalon event handler [\#1845](https://github.com/pypeclub/OpenPype/pull/1845)
+- Nuke: updating effects subset fail [\#1841](https://github.com/pypeclub/OpenPype/pull/1841)
+- nuke: write render node skipped with crop [\#1836](https://github.com/pypeclub/OpenPype/pull/1836)
+- Project folder structure overrides [\#1813](https://github.com/pypeclub/OpenPype/pull/1813)
+- Maya: fix yeti settings path in extractor [\#1809](https://github.com/pypeclub/OpenPype/pull/1809)
+- Failsafe for cross project containers. [\#1806](https://github.com/pypeclub/OpenPype/pull/1806)
+- Settings error dialog on show [\#1798](https://github.com/pypeclub/OpenPype/pull/1798)
+
+**Merged pull requests:**
+
+- Maya: add support for `RedshiftNormalMap` node, fix `tx` linear space 🚀 [\#1863](https://github.com/pypeclub/OpenPype/pull/1863)
+- Add support for pyenv-win on windows [\#1822](https://github.com/pypeclub/OpenPype/pull/1822)
+- PS, AE - send actual context when another webserver is running [\#1811](https://github.com/pypeclub/OpenPype/pull/1811)
+
+## [3.2.0](https://github.com/pypeclub/OpenPype/tree/3.2.0) (2021-07-13)
+
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.2.0-nightly.7...3.2.0)
+
+**🚀 Enhancements**
+
+- Nuke: ftrack family plugin settings preset [\#1805](https://github.com/pypeclub/OpenPype/pull/1805)
+- Standalone publisher last project [\#1799](https://github.com/pypeclub/OpenPype/pull/1799)
+- Ftrack Multiple notes as server action [\#1795](https://github.com/pypeclub/OpenPype/pull/1795)
+- Settings conditional dict [\#1777](https://github.com/pypeclub/OpenPype/pull/1777)
+- Settings application use python 2 only where needed [\#1776](https://github.com/pypeclub/OpenPype/pull/1776)
 - Settings UI copy/paste [\#1769](https://github.com/pypeclub/OpenPype/pull/1769)
 - Workfile tool widths [\#1766](https://github.com/pypeclub/OpenPype/pull/1766)
 - Push hierarchical attributes care about task parent changes [\#1763](https://github.com/pypeclub/OpenPype/pull/1763)
 - Application executables with environment variables [\#1757](https://github.com/pypeclub/OpenPype/pull/1757)
-- Settings Hosts enum [\#1739](https://github.com/pypeclub/OpenPype/pull/1739)
-- Validate containers settings [\#1736](https://github.com/pypeclub/OpenPype/pull/1736)
-- PS - added loader from sequence [\#1726](https://github.com/pypeclub/OpenPype/pull/1726)
-- Autoupdate launcher [\#1725](https://github.com/pypeclub/OpenPype/pull/1725)
-- Subset template and TVPaint subset template docs [\#1717](https://github.com/pypeclub/OpenPype/pull/1717)
-- Toggle Ftrack upload in StandalonePublisher [\#1708](https://github.com/pypeclub/OpenPype/pull/1708)
-- Overscan color extract review [\#1701](https://github.com/pypeclub/OpenPype/pull/1701)
-- Nuke: Prerender Frame Range by default [\#1699](https://github.com/pypeclub/OpenPype/pull/1699)
-- Smoother edges of color triangle [\#1695](https://github.com/pypeclub/OpenPype/pull/1695)
+- Deadline: Nuke submission additional attributes [\#1756](https://github.com/pypeclub/OpenPype/pull/1756)
 
 **🐛 Bug fixes**
 
+- nuke: fixing wrong name of family folder when `used existing frames` [\#1803](https://github.com/pypeclub/OpenPype/pull/1803)
+- Collect ftrack family bugs [\#1801](https://github.com/pypeclub/OpenPype/pull/1801)
+- Invitee email can be None which break the Ftrack commit. [\#1788](https://github.com/pypeclub/OpenPype/pull/1788)
+- Fix: staging and `--use-version` option [\#1786](https://github.com/pypeclub/OpenPype/pull/1786)
+- Otio unrelated error on import [\#1782](https://github.com/pypeclub/OpenPype/pull/1782)
 - FFprobe streams order [\#1775](https://github.com/pypeclub/OpenPype/pull/1775)
+- Fix - single file files are str only, cast it to list to count properly [\#1772](https://github.com/pypeclub/OpenPype/pull/1772)
+- Environments in app executable for MacOS [\#1768](https://github.com/pypeclub/OpenPype/pull/1768)
 - Project specific environments [\#1767](https://github.com/pypeclub/OpenPype/pull/1767)
 - Settings UI with refresh button [\#1764](https://github.com/pypeclub/OpenPype/pull/1764)
 - Standalone publisher thumbnail extractor fix [\#1761](https://github.com/pypeclub/OpenPype/pull/1761)
 - Anatomy others templates don't cause crash [\#1758](https://github.com/pypeclub/OpenPype/pull/1758)
-- Backend acre module commit update [\#1745](https://github.com/pypeclub/OpenPype/pull/1745)
-- hiero: precollect instances failing when audio selected [\#1743](https://github.com/pypeclub/OpenPype/pull/1743)
-- Hiero: creator instance error [\#1742](https://github.com/pypeclub/OpenPype/pull/1742)
-- Nuke: fixing render creator for no selection format failing [\#1741](https://github.com/pypeclub/OpenPype/pull/1741)
-- Local settings UI crash on missing defaults [\#1737](https://github.com/pypeclub/OpenPype/pull/1737)
-- TVPaint white background on thumbnail [\#1735](https://github.com/pypeclub/OpenPype/pull/1735)
-- Ftrack missing custom attribute message [\#1734](https://github.com/pypeclub/OpenPype/pull/1734)
-- Launcher project changes [\#1733](https://github.com/pypeclub/OpenPype/pull/1733)
-- Ftrack sync status [\#1732](https://github.com/pypeclub/OpenPype/pull/1732)
-- TVPaint use layer name for default variant [\#1724](https://github.com/pypeclub/OpenPype/pull/1724)
-- Default subset template for TVPaint review and workfile families [\#1716](https://github.com/pypeclub/OpenPype/pull/1716)
-- Maya: Extract review hotfix [\#1714](https://github.com/pypeclub/OpenPype/pull/1714)
-- Settings: Imageio improving granularity [\#1711](https://github.com/pypeclub/OpenPype/pull/1711)
-- Application without executables [\#1679](https://github.com/pypeclub/OpenPype/pull/1679)
 
 **Merged pull requests:**
 
+- Build: don't add Poetry to `PATH` [\#1808](https://github.com/pypeclub/OpenPype/pull/1808)
 - Bump prismjs from 1.23.0 to 1.24.0 in /website [\#1773](https://github.com/pypeclub/OpenPype/pull/1773)
-- TVPaint ftrack family [\#1755](https://github.com/pypeclub/OpenPype/pull/1755)
-- global: removing obsolete ftrack validator plugin [\#1710](https://github.com/pypeclub/OpenPype/pull/1710)
+- Bc/fix/docs [\#1771](https://github.com/pypeclub/OpenPype/pull/1771)
 
 ## [2.18.4](https://github.com/pypeclub/OpenPype/tree/2.18.4) (2021-06-24)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/2.18.3...2.18.4)
 
-**Merged pull requests:**
-
-- celaction fixes [\#1754](https://github.com/pypeclub/OpenPype/pull/1754)
-- celaciton: audio subset changed data structure [\#1750](https://github.com/pypeclub/OpenPype/pull/1750)
-
 ## [2.18.3](https://github.com/pypeclub/OpenPype/tree/2.18.3) (2021-06-23)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.2.0-nightly.2...2.18.3)
 
-**🐛 Bug fixes**
-
-- Tools names forwards compatibility [\#1727](https://github.com/pypeclub/OpenPype/pull/1727)
-
 ## [2.18.2](https://github.com/pypeclub/OpenPype/tree/2.18.2) (2021-06-16)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.1.0...2.18.2)
 
-**🚀 Enhancements**
-
-- StandalonePublisher: adding  exception for adding `delete` tag to repre [\#1650](https://github.com/pypeclub/OpenPype/pull/1650)
-
-**🐛 Bug fixes**
-
-- Maya: Extract review hotfix - 2.x backport [\#1713](https://github.com/pypeclub/OpenPype/pull/1713)
-- StandalonePublisher:  instance data attribute `keepSequence` [\#1668](https://github.com/pypeclub/OpenPype/pull/1668)
-
-**Merged pull requests:**
-
-- 1698 Nuke: Prerender Frame Range by default [\#1709](https://github.com/pypeclub/OpenPype/pull/1709)
-
 ## [3.1.0](https://github.com/pypeclub/OpenPype/tree/3.1.0) (2021-06-15)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.1.0-nightly.4...3.1.0)
 
-**🚀 Enhancements**
-
-- Log Viewer with OpenPype style [\#1703](https://github.com/pypeclub/OpenPype/pull/1703)
-- Scrolling in OpenPype info widget [\#1702](https://github.com/pypeclub/OpenPype/pull/1702)
-- OpenPype style in modules [\#1694](https://github.com/pypeclub/OpenPype/pull/1694)
-- Sort applications and tools alphabetically in Settings UI [\#1689](https://github.com/pypeclub/OpenPype/pull/1689)
-- \#683 - Validate Frame Range in Standalone Publisher [\#1683](https://github.com/pypeclub/OpenPype/pull/1683)
-- Hiero: old container versions identify with red color [\#1682](https://github.com/pypeclub/OpenPype/pull/1682)
-- Project Manger: Default name column width [\#1669](https://github.com/pypeclub/OpenPype/pull/1669)
-- Remove outline in stylesheet [\#1667](https://github.com/pypeclub/OpenPype/pull/1667)
-- TVPaint: Creator take layer name as default value for subset variant [\#1663](https://github.com/pypeclub/OpenPype/pull/1663)
-- TVPaint custom subset template [\#1662](https://github.com/pypeclub/OpenPype/pull/1662)
-- Editorial: conform assets validator [\#1659](https://github.com/pypeclub/OpenPype/pull/1659)
-- Feature Slack integration [\#1657](https://github.com/pypeclub/OpenPype/pull/1657)
-- Nuke - Publish simplification [\#1653](https://github.com/pypeclub/OpenPype/pull/1653)
-- \#1333 - added tooltip hints to Pyblish buttons [\#1649](https://github.com/pypeclub/OpenPype/pull/1649)
-
-**🐛 Bug fixes**
-
-- Nuke: broken publishing rendered frames [\#1707](https://github.com/pypeclub/OpenPype/pull/1707)
-- Standalone publisher Thumbnail export args [\#1705](https://github.com/pypeclub/OpenPype/pull/1705)
-- Bad zip can break OpenPype start [\#1691](https://github.com/pypeclub/OpenPype/pull/1691)
-- Hiero: published whole edit mov [\#1687](https://github.com/pypeclub/OpenPype/pull/1687)
-- Ftrack subprocess handle of stdout/stderr [\#1675](https://github.com/pypeclub/OpenPype/pull/1675)
-- Settings list race condifiton and mutable dict list conversion [\#1671](https://github.com/pypeclub/OpenPype/pull/1671)
-- Mac launch arguments fix [\#1660](https://github.com/pypeclub/OpenPype/pull/1660)
-- Fix missing dbm python module [\#1652](https://github.com/pypeclub/OpenPype/pull/1652)
-- Transparent branches in view on Mac [\#1648](https://github.com/pypeclub/OpenPype/pull/1648)
-- Add asset on task item [\#1646](https://github.com/pypeclub/OpenPype/pull/1646)
-- Project manager save and queue [\#1645](https://github.com/pypeclub/OpenPype/pull/1645)
-- New project anatomy values [\#1644](https://github.com/pypeclub/OpenPype/pull/1644)
-
-**Merged pull requests:**
-
-- update dependencies [\#1697](https://github.com/pypeclub/OpenPype/pull/1697)
-- Bump normalize-url from 4.5.0 to 4.5.1 in /website [\#1686](https://github.com/pypeclub/OpenPype/pull/1686)
-
 # Changelog
 
 
diff --git a/README.md b/README.md
index 6b4495c9b6..209af24c75 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ The main things you will need to run and build OpenPype are:
     - PowerShell 5.0+ (Windows)
     - Bash (Linux)
 - [**Python 3.7.8**](#python) or higher
-- [**MongoDB**](#database)
+- [**MongoDB**](#database) (needed only for local development)
 
 
 It can be built and ran on all common platforms. We develop and test on the following:
@@ -126,6 +126,16 @@ pyenv local 3.7.9
 
 ### Linux
 
+#### Docker
+Easiest way to build OpenPype on Linux is using [Docker](https://www.docker.com/). Just run:
+
+```sh
+sudo ./tools/docker_build.sh
+```
+
+If all is successful, you'll find built OpenPype in `./build/` folder.
+
+#### Manual build
 You will need [Python 3.7](https://www.python.org/downloads/) and [git](https://git-scm.com/downloads). You'll also need [curl](https://curl.se) on systems that doesn't have one preinstalled.
 
 To build Python related stuff, you need Python header files installed (`python3-dev` on Ubuntu for example).
@@ -133,7 +143,6 @@ To build Python related stuff, you need Python header files installed (`python3-
 You'll need also other tools to build
 some OpenPype dependencies like [CMake](https://cmake.org/). Python 3 should be part of all modern distributions. You can use your package manager to install **git** and **cmake**.
 
-
 <details>
 <summary>Details for Ubuntu</summary>
 Install git, cmake and curl
diff --git a/igniter/bootstrap_repos.py b/igniter/bootstrap_repos.py
index 6eaea27116..8c081b8614 100644
--- a/igniter/bootstrap_repos.py
+++ b/igniter/bootstrap_repos.py
@@ -657,7 +657,7 @@ class BootstrapRepos:
             ]
 
         # remove duplicates
-        openpype_versions = list(set(openpype_versions))
+        openpype_versions = sorted(list(set(openpype_versions)))
 
         return openpype_versions
 
diff --git a/openpype/__init__.py b/openpype/__init__.py
index a86d2bc2be..e7462e14e9 100644
--- a/openpype/__init__.py
+++ b/openpype/__init__.py
@@ -98,6 +98,11 @@ def install():
             .get(platform_name)
         ) or []
         for path in project_plugins:
+            try:
+                path = str(path.format(**os.environ))
+            except KeyError:
+                pass
+
             if not path or not os.path.exists(path):
                 continue
 
diff --git a/openpype/cli.py b/openpype/cli.py
index 48951c7287..ec5b04c468 100644
--- a/openpype/cli.py
+++ b/openpype/cli.py
@@ -15,6 +15,9 @@ from .pype_commands import PypeCommands
               expose_value=False, help="use specified version")
 @click.option("--use-staging", is_flag=True,
               expose_value=False, help="use staging variants")
+@click.option("--list-versions", is_flag=True, expose_value=False,
+              help=("list all detected versions. Use With `--use-staging "
+                    "to list staging versions."))
 def main(ctx):
     """Pype is main command serving as entry point to pipeline system.
 
diff --git a/openpype/hooks/pre_copy_template_workfile.py b/openpype/hooks/pre_copy_template_workfile.py
index 29a522f933..5c56d721e8 100644
--- a/openpype/hooks/pre_copy_template_workfile.py
+++ b/openpype/hooks/pre_copy_template_workfile.py
@@ -49,7 +49,7 @@ class CopyTemplateWorkfile(PreLaunchHook):
             ))
             return
 
-        self.log.info("Last workfile does not exits.")
+        self.log.info("Last workfile does not exist.")
 
         project_name = self.data["project_name"]
         asset_name = self.data["asset_name"]
diff --git a/openpype/hooks/pre_foundry_apps.py b/openpype/hooks/pre_foundry_apps.py
new file mode 100644
index 0000000000..85f68c6b60
--- /dev/null
+++ b/openpype/hooks/pre_foundry_apps.py
@@ -0,0 +1,28 @@
+import subprocess
+from openpype.lib import PreLaunchHook
+
+
+class LaunchFoundryAppsWindows(PreLaunchHook):
+    """Foundry applications have specific way how to launch them.
+
+    Nuke is executed "like" python process so it is required to pass
+    `CREATE_NEW_CONSOLE` flag on windows to trigger creation of new console.
+    At the same time the newly created console won't create it's own stdout
+    and stderr handlers so they should not be redirected to DEVNULL.
+    """
+
+    # Should be as last hook because must change launch arguments to string
+    order = 1000
+    app_groups = ["nuke", "nukex", "hiero", "nukestudio"]
+    platforms = ["windows"]
+
+    def execute(self):
+        # Change `creationflags` to CREATE_NEW_CONSOLE
+        # - on Windows will nuke create new window using it's console
+        # Set `stdout` and `stderr` to None so new created console does not
+        #   have redirected output to DEVNULL in build
+        self.launch_context.kwargs.update({
+            "creationflags": subprocess.CREATE_NEW_CONSOLE,
+            "stdout": None,
+            "stderr": None
+        })
diff --git a/openpype/hooks/pre_non_python_host_launch.py b/openpype/hooks/pre_non_python_host_launch.py
index 393a878f76..0447f4a06f 100644
--- a/openpype/hooks/pre_non_python_host_launch.py
+++ b/openpype/hooks/pre_non_python_host_launch.py
@@ -49,5 +49,7 @@ class NonPythonHostHook(PreLaunchHook):
         if remainders:
             self.launch_context.launch_args.extend(remainders)
 
+        # This must be set otherwise it wouldn't be possible to catch output
+        #   when build OpenPype is used.
         self.launch_context.kwargs["stdout"] = subprocess.DEVNULL
-        self.launch_context.kwargs["stderr"] = subprocess.STDOUT
+        self.launch_context.kwargs["stderr"] = subprocess.DEVNULL
diff --git a/openpype/hooks/pre_with_windows_shell.py b/openpype/hooks/pre_with_windows_shell.py
deleted file mode 100644
index 441ab1a675..0000000000
--- a/openpype/hooks/pre_with_windows_shell.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import os
-import subprocess
-from openpype.lib import PreLaunchHook
-
-
-class LaunchWithWindowsShell(PreLaunchHook):
-    """Add shell command before executable.
-
-    Some hosts have issues when are launched directly from python in that case
-    it is possible to prepend shell executable which will trigger process
-    instead.
-    """
-
-    # Should be as last hook because must change launch arguments to string
-    order = 1000
-    app_groups = ["nuke", "nukex", "hiero", "nukestudio"]
-    platforms = ["windows"]
-
-    def execute(self):
-        launch_args = self.launch_context.clear_launch_args(
-            self.launch_context.launch_args)
-        new_args = [
-            # Get comspec which is cmd.exe in most cases.
-            os.environ.get("COMSPEC", "cmd.exe"),
-            # NOTE change to "/k" if want to keep console opened
-            "/c",
-            # Convert arguments to command line arguments (as string)
-            "\"{}\"".format(
-                subprocess.list2cmdline(launch_args)
-            )
-        ]
-        # Convert list to string
-        # WARNING this only works if is used as string
-        args_string = " ".join(new_args)
-        self.log.info((
-            "Modified launch arguments to be launched with shell \"{}\"."
-        ).format(args_string))
-
-        # Replace launch args with new one
-        self.launch_context.launch_args = args_string
-        # Change `creationflags` to CREATE_NEW_CONSOLE
-        self.launch_context.kwargs["creationflags"] = (
-            subprocess.CREATE_NEW_CONSOLE
-        )
diff --git a/openpype/hosts/aftereffects/plugins/create/create_local_render.py b/openpype/hosts/aftereffects/plugins/create/create_local_render.py
new file mode 100644
index 0000000000..9cc06eb698
--- /dev/null
+++ b/openpype/hosts/aftereffects/plugins/create/create_local_render.py
@@ -0,0 +1,17 @@
+from openpype.hosts.aftereffects.plugins.create import create_render
+
+import logging
+
+log = logging.getLogger(__name__)
+
+
+class CreateLocalRender(create_render.CreateRender):
+    """ Creator to render locally.
+
+        Created only after default render on farm. So family 'render.local' is
+        used for backward compatibility.
+    """
+
+    name = "renderDefault"
+    label = "Render Locally"
+    family = "renderLocal"
diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
index baac64ed0c..be024b7e24 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
@@ -1,10 +1,14 @@
-from openpype.lib import abstract_collect_render
-from openpype.lib.abstract_collect_render import RenderInstance
-import pyblish.api
-import attr
 import os
+import re
+import attr
+import tempfile
 
 from avalon import aftereffects
+import pyblish.api
+
+from openpype.settings import get_project_settings
+from openpype.lib import abstract_collect_render
+from openpype.lib.abstract_collect_render import RenderInstance
 
 
 @attr.s
@@ -13,6 +17,8 @@ class AERenderInstance(RenderInstance):
     comp_name = attr.ib(default=None)
     comp_id = attr.ib(default=None)
     fps = attr.ib(default=None)
+    projectEntity = attr.ib(default=None)
+    stagingDir = attr.ib(default=None)
 
 
 class CollectAERender(abstract_collect_render.AbstractCollectRender):
@@ -21,6 +27,11 @@ class CollectAERender(abstract_collect_render.AbstractCollectRender):
     label = "Collect After Effects Render Layers"
     hosts = ["aftereffects"]
 
+    # internal
+    family_remapping = {
+        "render": ("render.farm", "farm"),   # (family, label)
+        "renderLocal": ("render", "local")
+    }
     padding_width = 6
     rendered_extension = 'png'
 
@@ -62,14 +73,16 @@ class CollectAERender(abstract_collect_render.AbstractCollectRender):
             fps = work_area_info.frameRate
             # TODO add resolution when supported by extension
 
-            if inst["family"] == "render" and inst["active"]:
+            if inst["family"] in self.family_remapping.keys() \
+                    and inst["active"]:
+                remapped_family = self.family_remapping[inst["family"]]
                 instance = AERenderInstance(
-                    family="render.farm",  # other way integrate would catch it
-                    families=["render.farm"],
+                    family=remapped_family[0],
+                    families=[remapped_family[0]],
                     version=version,
                     time="",
                     source=current_file,
-                    label="{} - farm".format(inst["subset"]),
+                    label="{} - {}".format(inst["subset"], remapped_family[1]),
                     subset=inst["subset"],
                     asset=context.data["assetEntity"]["name"],
                     attachTo=False,
@@ -105,6 +118,30 @@ class CollectAERender(abstract_collect_render.AbstractCollectRender):
 
                 instance.outputDir = self._get_output_dir(instance)
 
+                settings = get_project_settings(os.getenv("AVALON_PROJECT"))
+                reviewable_subset_filter = \
+                    (settings["deadline"]
+                             ["publish"]
+                             ["ProcessSubmittedJobOnFarm"]
+                             ["aov_filter"])
+
+                if inst["family"] == "renderLocal":
+                    # for local renders
+                    instance.anatomyData["version"] = instance.version
+                    instance.anatomyData["subset"] = instance.subset
+                    instance.stagingDir = tempfile.mkdtemp()
+                    instance.projectEntity = project_entity
+
+                    if self.hosts[0] in reviewable_subset_filter.keys():
+                        for aov_pattern in \
+                                reviewable_subset_filter[self.hosts[0]]:
+                            if re.match(aov_pattern, instance.subset):
+                                instance.families.append("review")
+                                instance.review = True
+                                break
+
+                self.log.info("New instance:: {}".format(instance))
+
                 instances.append(instance)
 
         return instances
diff --git a/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py b/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py
new file mode 100644
index 0000000000..37337e7fee
--- /dev/null
+++ b/openpype/hosts/aftereffects/plugins/publish/extract_local_render.py
@@ -0,0 +1,82 @@
+import os
+import six
+import sys
+
+import openpype.api
+from avalon import aftereffects
+
+
+class ExtractLocalRender(openpype.api.Extractor):
+    """Render RenderQueue locally."""
+
+    order = openpype.api.Extractor.order - 0.47
+    label = "Extract Local Render"
+    hosts = ["aftereffects"]
+    families = ["render"]
+
+    def process(self, instance):
+        stub = aftereffects.stub()
+        staging_dir = instance.data["stagingDir"]
+        self.log.info("staging_dir::{}".format(staging_dir))
+
+        stub.render(staging_dir)
+
+        # pull file name from Render Queue Output module
+        render_q = stub.get_render_info()
+        if not render_q:
+            raise ValueError("No file extension set in Render Queue")
+        _, ext = os.path.splitext(os.path.basename(render_q.file_name))
+        ext = ext[1:]
+
+        first_file_path = None
+        files = []
+        self.log.info("files::{}".format(os.listdir(staging_dir)))
+        for file_name in os.listdir(staging_dir):
+            files.append(file_name)
+            if first_file_path is None:
+                first_file_path = os.path.join(staging_dir,
+                                               file_name)
+
+        resulting_files = files
+        if len(files) == 1:
+            resulting_files = files[0]
+
+        repre_data = {
+            "frameStart": instance.data["frameStart"],
+            "frameEnd": instance.data["frameEnd"],
+            "name": ext,
+            "ext": ext,
+            "files": resulting_files,
+            "stagingDir": staging_dir
+        }
+        if instance.data["review"]:
+            repre_data["tags"] = ["review"]
+
+        instance.data["representations"] = [repre_data]
+
+        ffmpeg_path = openpype.lib.get_ffmpeg_tool_path("ffmpeg")
+        # Generate thumbnail.
+        thumbnail_path = os.path.join(staging_dir,
+                                      "thumbnail.jpg")
+
+        args = [
+            ffmpeg_path, "-y",
+            "-i", first_file_path,
+            "-vf", "scale=300:-1",
+            "-vframes", "1",
+            thumbnail_path
+        ]
+        self.log.debug("Thumbnail args:: {}".format(args))
+        try:
+            output = openpype.lib.run_subprocess(args)
+        except TypeError:
+            self.log.warning("Error in creating thumbnail")
+            six.reraise(*sys.exc_info())
+
+        instance.data["representations"].append({
+            "name": "thumbnail",
+            "ext": "jpg",
+            "files": os.path.basename(thumbnail_path),
+            "stagingDir": staging_dir,
+            "tags": ["thumbnail"]
+        })
diff --git a/openpype/hosts/aftereffects/plugins/publish/validate_instance_asset.py b/openpype/hosts/aftereffects/plugins/publish/validate_instance_asset.py
new file mode 100644
index 0000000000..eff89adcb3
--- /dev/null
+++ b/openpype/hosts/aftereffects/plugins/publish/validate_instance_asset.py
@@ -0,0 +1,61 @@
+from avalon import api
+import pyblish.api
+import openpype.api
+from avalon import aftereffects
+
+
+class ValidateInstanceAssetRepair(pyblish.api.Action):
+    """Repair the instance asset with value from Context."""
+
+    label = "Repair"
+    icon = "wrench"
+    on = "failed"
+
+    def process(self, context, plugin):
+
+        # Get the errored instances
+        failed = []
+        for result in context.data["results"]:
+            if (result["error"] is not None and result["instance"] is not None
+                    and result["instance"] not in failed):
+                failed.append(result["instance"])
+
+        # Apply pyblish.logic to get the instances for the plug-in
+        instances = pyblish.api.instances_by_plugin(failed, plugin)
+        stub = aftereffects.stub()
+        for instance in instances:
+            data = stub.read(instance[0])
+
+            data["asset"] = api.Session["AVALON_ASSET"]
+            stub.imprint(instance[0], data)
+
+
+class ValidateInstanceAsset(pyblish.api.InstancePlugin):
+    """Validate the instance asset is the current selected context asset.
+
+        As it might happen that multiple worfiles are opened at same time,
+        switching between them would mess with selected context. (From Launcher
+        or Ftrack).
+
+        In that case outputs might be output under wrong asset!
+
+        Repair action will use Context asset value (from Workfiles or Launcher)
+        Closing and reopening with Workfiles will refresh  Context value.
+    """
+
+    label = "Validate Instance Asset"
+    hosts = ["aftereffects"]
+    actions = [ValidateInstanceAssetRepair]
+    order = openpype.api.ValidateContentsOrder
+
+    def process(self, instance):
+        instance_asset = instance.data["asset"]
+        current_asset = api.Session["AVALON_ASSET"]
+        msg = (
+            f"Instance asset {instance_asset} is not the same "
+            f"as current context {current_asset}. PLEASE DO:\n"
+            f"Repair with 'A' action to use '{current_asset}'.\n"
+            f"If that's not correct value, close workfile and "
+            f"reopen via Workfiles!"
+        )
+        assert instance_asset == current_asset, msg
diff --git a/openpype/hosts/aftereffects/plugins/publish/validate_scene_settings.py b/openpype/hosts/aftereffects/plugins/publish/validate_scene_settings.py
index 5301a2f3ea..7fba11957c 100644
--- a/openpype/hosts/aftereffects/plugins/publish/validate_scene_settings.py
+++ b/openpype/hosts/aftereffects/plugins/publish/validate_scene_settings.py
@@ -53,7 +53,7 @@ class ValidateSceneSettings(pyblish.api.InstancePlugin):
 
     order = pyblish.api.ValidatorOrder
     label = "Validate Scene Settings"
-    families = ["render.farm"]
+    families = ["render.farm", "render"]
     hosts = ["aftereffects"]
     optional = True
 
diff --git a/openpype/hosts/hiero/plugins/load/load_clip.py b/openpype/hosts/hiero/plugins/load/load_clip.py
index 9e12fa360e..b905dd4431 100644
--- a/openpype/hosts/hiero/plugins/load/load_clip.py
+++ b/openpype/hosts/hiero/plugins/load/load_clip.py
@@ -54,6 +54,10 @@ class LoadClip(phiero.SequenceLoader):
         object_name = self.clip_name_template.format(
             **context["representation"]["context"])
 
+        # set colorspace
+        if colorspace:
+            track_item.source().setSourceMediaColourTransform(colorspace)
+
         # add additional metadata from the version to imprint Avalon knob
         add_keys = [
             "frameStart", "frameEnd", "source", "author",
@@ -109,9 +113,14 @@ class LoadClip(phiero.SequenceLoader):
         colorspace = version_data.get("colorspace", None)
         object_name = "{}_{}".format(name, namespace)
         file = api.get_representation_path(representation).replace("\\", "/")
+        clip = track_item.source()
 
         # reconnect media to new path
-        track_item.source().reconnectMedia(file)
+        clip.reconnectMedia(file)
+
+        # set colorspace
+        if colorspace:
+            clip.setSourceMediaColourTransform(colorspace)
 
         # add additional metadata from the version to imprint Avalon knob
         add_keys = [
@@ -160,6 +169,7 @@ class LoadClip(phiero.SequenceLoader):
     @classmethod
     def set_item_color(cls, track_item, version):
 
+        clip = track_item.source()
         # define version name
         version_name = version.get("name", None)
         # get all versions in list
@@ -172,6 +182,6 @@ class LoadClip(phiero.SequenceLoader):
 
         # set clip colour
         if version_name == max_version:
-            track_item.source().binItem().setColor(cls.clip_color_last)
+            clip.binItem().setColor(cls.clip_color_last)
         else:
-            track_item.source().binItem().setColor(cls.clip_color)
+            clip.binItem().setColor(cls.clip_color)
diff --git a/openpype/hosts/hiero/plugins/publish/precollect_instances.py b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
index 4984849aa7..9b529edf88 100644
--- a/openpype/hosts/hiero/plugins/publish/precollect_instances.py
+++ b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
@@ -120,6 +120,13 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             # create instance
             instance = context.create_instance(**data)
 
+            # add colorspace data
+            instance.data.update({
+                "versionData": {
+                    "colorspace": track_item.sourceMediaColourTransform(),
+                }
+            })
+
             # create shot instance for shot attributes create/update
             self.create_shot_instance(context, **data)
 
@@ -133,13 +140,6 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             # create audio subset instance
             self.create_audio_instance(context, **data)
 
-            # add colorspace data
-            instance.data.update({
-                "versionData": {
-                    "colorspace": track_item.sourceMediaColourTransform(),
-                }
-            })
-
             # add audioReview attribute to plate instance data
             # if reviewTrack is on
             if tag_data.get("reviewTrack") is not None:
diff --git a/openpype/hosts/houdini/plugins/publish/collect_instances.py b/openpype/hosts/houdini/plugins/publish/collect_instances.py
index 413553c864..2e294face2 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_instances.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_instances.py
@@ -56,7 +56,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
             # Create nice name if the instance has a frame range.
             label = data.get("name", node.name())
             if "frameStart" in data and "frameEnd" in data:
-                frames = "[{startFrame} - {endFrame}]".format(**data)
+                frames = "[{frameStart} - {frameEnd}]".format(**data)
                 label = "{} {}".format(label, frames)
 
             instance = context.create_instance(label)
diff --git a/openpype/hosts/maya/api/__init__.py b/openpype/hosts/maya/api/__init__.py
index 4697d212de..9219da407f 100644
--- a/openpype/hosts/maya/api/__init__.py
+++ b/openpype/hosts/maya/api/__init__.py
@@ -26,6 +26,12 @@ INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory")
 
 
 def install():
+    from openpype.settings import get_project_settings
+
+    project_settings = get_project_settings(os.getenv("AVALON_PROJECT"))
+    # process path mapping
+    process_dirmap(project_settings)
+
     pyblish.register_plugin_path(PUBLISH_PATH)
     avalon.register_plugin_path(avalon.Loader, LOAD_PATH)
     avalon.register_plugin_path(avalon.Creator, CREATE_PATH)
@@ -53,6 +59,40 @@ def install():
     avalon.data["familiesStateToggled"] = ["imagesequence"]
 
 
+def process_dirmap(project_settings):
+    # type: (dict) -> None
+    """Go through all paths in Settings and set them using `dirmap`.
+
+    Args:
+        project_settings (dict): Settings for current project.
+
+    """
+    if not project_settings["maya"].get("maya-dirmap"):
+        return
+    mapping = project_settings["maya"]["maya-dirmap"]["paths"] or {}
+    mapping_enabled = project_settings["maya"]["maya-dirmap"]["enabled"]
+    if not mapping or not mapping_enabled:
+        return
+    if mapping.get("source-path") and mapping_enabled is True:
+        log.info("Processing directory mapping ...")
+        cmds.dirmap(en=True)
+    for k, sp in enumerate(mapping["source-path"]):
+        try:
+            print("{} -> {}".format(sp, mapping["destination-path"][k]))
+            cmds.dirmap(m=(sp, mapping["destination-path"][k]))
+            cmds.dirmap(m=(mapping["destination-path"][k], sp))
+        except IndexError:
+            # missing corresponding destination path
+            log.error(("invalid dirmap mapping, missing corresponding"
+                       " destination directory."))
+            break
+        except RuntimeError:
+            log.error("invalid path {} -> {}, mapping not registered".format(
+                sp, mapping["destination-path"][k]
+            ))
+            continue
+
+
 def uninstall():
     pyblish.deregister_plugin_path(PUBLISH_PATH)
     avalon.deregister_plugin_path(avalon.Loader, LOAD_PATH)
diff --git a/openpype/hosts/maya/api/commands.py b/openpype/hosts/maya/api/commands.py
new file mode 100644
index 0000000000..d4c2b6a225
--- /dev/null
+++ b/openpype/hosts/maya/api/commands.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+"""OpenPype script commands to be used directly in Maya."""
+
+
+class ToolWindows:
+
+    _windows = {}
+
+    @classmethod
+    def get_window(cls, tool):
+        """Get widget for specific tool.
+
+        Args:
+            tool (str): Name of the tool.
+
+        Returns:
+            Stored widget.
+
+        """
+        try:
+            return cls._windows[tool]
+        except KeyError:
+            return None
+
+    @classmethod
+    def set_window(cls, tool, window):
+        """Set widget for the tool.
+
+        Args:
+            tool (str): Name of the tool.
+            window (QtWidgets.QWidget): Widget
+
+        """
+        cls._windows[tool] = window
+
+
+def edit_shader_definitions():
+    from avalon.tools import lib
+    from Qt import QtWidgets
+    from openpype.hosts.maya.api.shader_definition_editor import (
+        ShaderDefinitionsEditor
+    )
+
+    top_level_widgets = QtWidgets.QApplication.topLevelWidgets()
+    main_window = next(widget for widget in top_level_widgets
+                       if widget.objectName() == "MayaWindow")
+
+    with lib.application():
+        window = ToolWindows.get_window("shader_definition_editor")
+        if not window:
+            window = ShaderDefinitionsEditor(parent=main_window)
+            ToolWindows.set_window("shader_definition_editor", window)
+        window.show()
diff --git a/openpype/hosts/maya/api/menu.py b/openpype/hosts/maya/api/menu.py
index 42e5c66e4a..0dced48868 100644
--- a/openpype/hosts/maya/api/menu.py
+++ b/openpype/hosts/maya/api/menu.py
@@ -6,9 +6,9 @@ from avalon.vendor.Qt import QtWidgets, QtGui
 from avalon.maya import pipeline
 from openpype.api import BuildWorkfile
 import maya.cmds as cmds
+from openpype.settings import get_project_settings
 
 self = sys.modules[__name__]
-self._menu = os.environ.get("AVALON_LABEL")
 
 
 log = logging.getLogger(__name__)
@@ -17,8 +17,11 @@ log = logging.getLogger(__name__)
 def _get_menu(menu_name=None):
     """Return the menu instance if it currently exists in Maya"""
 
+    project_settings = get_project_settings(os.getenv("AVALON_PROJECT"))
+    _menu = project_settings["maya"]["scriptsmenu"]["name"]
+
     if menu_name is None:
-        menu_name = self._menu
+        menu_name = _menu
     widgets = dict((
         w.objectName(), w) for w in QtWidgets.QApplication.allWidgets())
     menu = widgets.get(menu_name)
@@ -55,35 +58,7 @@ def deferred():
                 parent=pipeline._parent
             )
 
-        # Find the pipeline menu
-        top_menu = _get_menu(pipeline._menu)
-
-        # Try to find workfile tool action in the menu
-        workfile_action = None
-        for action in top_menu.actions():
-            if action.text() == "Work Files":
-                workfile_action = action
-                break
-
-        # Add at the top of menu if "Work Files" action was not found
-        after_action = ""
-        if workfile_action:
-            # Use action's object name for `insertAfter` argument
-            after_action = workfile_action.objectName()
-
-        # Insert action to menu
-        cmds.menuItem(
-            "Work Files",
-            parent=pipeline._menu,
-            command=launch_workfiles_app,
-            insertAfter=after_action
-        )
-
-        # Remove replaced action
-        if workfile_action:
-            top_menu.removeAction(workfile_action)
-
-    log.info("Attempting to install scripts menu..")
+    log.info("Attempting to install scripts menu ...")
 
     add_build_workfiles_item()
     add_look_assigner_item()
@@ -100,13 +75,18 @@ def deferred():
         return
 
     # load configuration of custom menu
-    config_path = os.path.join(os.path.dirname(__file__), "menu.json")
-    config = scriptsmenu.load_configuration(config_path)
+    project_settings = get_project_settings(os.getenv("AVALON_PROJECT"))
+    config = project_settings["maya"]["scriptsmenu"]["definition"]
+    _menu = project_settings["maya"]["scriptsmenu"]["name"]
+
+    if not config:
+        log.warning("Skipping studio menu, no definition found.")
+        return
 
     # run the launcher for Maya menu
     studio_menu = launchformaya.main(
-        title=self._menu.title(),
-        objectName=self._menu
+        title=_menu.title(),
+        objectName=_menu.title().lower().replace(" ", "_")
     )
 
     # apply configuration
@@ -116,7 +96,7 @@ def deferred():
 def uninstall():
     menu = _get_menu()
     if menu:
-        log.info("Attempting to uninstall..")
+        log.info("Attempting to uninstall ...")
 
         try:
             menu.deleteLater()
@@ -136,9 +116,8 @@ def install():
 
 
 def popup():
-    """Pop-up the existing menu near the mouse cursor"""
+    """Pop-up the existing menu near the mouse cursor."""
     menu = _get_menu()
-
     cursor = QtGui.QCursor()
     point = cursor.pos()
     menu.exec_(point)
diff --git a/openpype/hosts/maya/api/shader_definition_editor.py b/openpype/hosts/maya/api/shader_definition_editor.py
new file mode 100644
index 0000000000..73cc6246ab
--- /dev/null
+++ b/openpype/hosts/maya/api/shader_definition_editor.py
@@ -0,0 +1,176 @@
+# -*- coding: utf-8 -*-
+"""Editor for shader definitions.
+
+Shader names are stored as simple text file over GridFS in mongodb.
+
+"""
+import os
+from Qt import QtWidgets, QtCore, QtGui
+from openpype.lib.mongo import OpenPypeMongoConnection
+from openpype import resources
+import gridfs
+
+
+DEFINITION_FILENAME = "{}/maya/shader_definition.txt".format(
+    os.getenv("AVALON_PROJECT"))
+
+
+class ShaderDefinitionsEditor(QtWidgets.QWidget):
+    """Widget serving as simple editor for shader name definitions."""
+
+    # name of the file used to store definitions
+
+    def __init__(self, parent=None):
+        super(ShaderDefinitionsEditor, self).__init__(parent)
+        self._mongo = OpenPypeMongoConnection.get_mongo_client()
+        self._gridfs = gridfs.GridFS(
+            self._mongo[os.getenv("OPENPYPE_DATABASE_NAME")])
+        self._editor = None
+
+        self._original_content = self._read_definition_file()
+
+        self.setObjectName("shaderDefinitionEditor")
+        self.setWindowTitle("OpenPype shader name definition editor")
+        icon = QtGui.QIcon(resources.pype_icon_filepath())
+        self.setWindowIcon(icon)
+        self.setWindowFlags(QtCore.Qt.Window)
+        self.setParent(parent)
+        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
+        self.resize(750, 500)
+
+        self._setup_ui()
+        self._reload()
+
+    def _setup_ui(self):
+        """Setup UI of Widget."""
+        layout = QtWidgets.QVBoxLayout(self)
+        label = QtWidgets.QLabel()
+        label.setText("Put shader names here - one name per line:")
+        layout.addWidget(label)
+        self._editor = QtWidgets.QPlainTextEdit()
+        self._editor.setStyleSheet("border: none;")
+        layout.addWidget(self._editor)
+
+        btn_layout = QtWidgets.QHBoxLayout()
+        save_btn = QtWidgets.QPushButton("Save")
+        save_btn.clicked.connect(self._save)
+
+        reload_btn = QtWidgets.QPushButton("Reload")
+        reload_btn.clicked.connect(self._reload)
+
+        exit_btn = QtWidgets.QPushButton("Exit")
+        exit_btn.clicked.connect(self._close)
+
+        btn_layout.addWidget(reload_btn)
+        btn_layout.addWidget(save_btn)
+        btn_layout.addWidget(exit_btn)
+
+        layout.addLayout(btn_layout)
+
+    def _read_definition_file(self, file=None):
+        """Read definition file from database.
+
+        Args:
+            file (gridfs.grid_file.GridOut, Optional): File to read. If not
+                set, new query will be issued to find it.
+
+        Returns:
+            str: Content of the file or empty string if file doesn't exist.
+
+        """
+        content = ""
+        if not file:
+            file = self._gridfs.find_one(
+                {"filename": DEFINITION_FILENAME})
+        if not file:
+            print(">>> [SNDE]: nothing in database yet")
+            return content
+        content = file.read()
+        file.close()
+        return content
+
+    def _write_definition_file(self, content, force=False):
+        """Write content as definition to file in database.
+
+        Before file is writen, check is made if its content has not
+        changed. If is changed, warning is issued to user if he wants
+        it to overwrite. Note: GridFs doesn't allow changing file content.
+        You need to delete existing file and create new one.
+
+        Args:
+            content (str): Content to write.
+
+        Raises:
+            ContentException: If file is changed in database while
+                editor is running.
+        """
+        file = self._gridfs.find_one(
+            {"filename": DEFINITION_FILENAME})
+        if file:
+            content_check = self._read_definition_file(file)
+            if content == content_check:
+                print(">>> [SNDE]: content not changed")
+                return
+            if self._original_content != content_check:
+                if not force:
+                    raise ContentException("Content changed")
+            print(">>> [SNDE]: overwriting data")
+            file.close()
+            self._gridfs.delete(file._id)
+
+        file = self._gridfs.new_file(
+            filename=DEFINITION_FILENAME,
+            content_type='text/plain',
+            encoding='utf-8')
+        file.write(content)
+        file.close()
+        QtCore.QTimer.singleShot(200, self._reset_style)
+        self._editor.setStyleSheet("border: 1px solid #33AF65;")
+        self._original_content = content
+
+    def _reset_style(self):
+        """Reset editor style back.
+
+        Used to visually indicate save.
+
+        """
+        self._editor.setStyleSheet("border: none;")
+
+    def _close(self):
+        self.hide()
+
+    def closeEvent(self, event):
+        event.ignore()
+        self.hide()
+
+    def _reload(self):
+        print(">>> [SNDE]: reloading")
+        self._set_content(self._read_definition_file())
+
+    def _save(self):
+        try:
+            self._write_definition_file(content=self._editor.toPlainText())
+        except ContentException:
+            # content has changed meanwhile
+            print(">>> [SNDE]: content has changed")
+            self._show_overwrite_warning()
+
+    def _set_content(self, content):
+        self._editor.setPlainText(content)
+
+    def _show_overwrite_warning(self):
+        reply = QtWidgets.QMessageBox.question(
+            self,
+            "Warning",
+            ("Content you are editing was changed meanwhile in database.\n"
+             "Please, reload and solve the conflict."),
+            QtWidgets.QMessageBox.OK)
+
+        if reply == QtWidgets.QMessageBox.OK:
+            # do nothing
+            pass
+
+
+class ContentException(Exception):
+    """This is risen during save if file is changed in database."""
+    pass
diff --git a/openpype/hosts/maya/plugins/publish/collect_look.py b/openpype/hosts/maya/plugins/publish/collect_look.py
index bf24b463ac..0dde52447d 100644
--- a/openpype/hosts/maya/plugins/publish/collect_look.py
+++ b/openpype/hosts/maya/plugins/publish/collect_look.py
@@ -167,6 +167,8 @@ def get_file_node_path(node):
 
     if cmds.nodeType(node) == 'aiImage':
         return cmds.getAttr('{0}.filename'.format(node))
+    if cmds.nodeType(node) == 'RedshiftNormalMap':
+        return cmds.getAttr('{}.tex0'.format(node))
 
     # otherwise use fileTextureName
     return cmds.getAttr('{0}.fileTextureName'.format(node))
@@ -357,6 +359,7 @@ class CollectLook(pyblish.api.InstancePlugin):
 
             files = cmds.ls(history, type="file", long=True)
             files.extend(cmds.ls(history, type="aiImage", long=True))
+            files.extend(cmds.ls(history, type="RedshiftNormalMap", long=True))
 
         self.log.info("Collected file nodes:\n{}".format(files))
         # Collect textures if any file nodes are found
@@ -487,7 +490,7 @@ class CollectLook(pyblish.api.InstancePlugin):
         """
 
         self.log.debug("processing: {}".format(node))
-        if cmds.nodeType(node) not in ["file", "aiImage"]:
+        if cmds.nodeType(node) not in ["file", "aiImage", "RedshiftNormalMap"]:
             self.log.error(
                 "Unsupported file node: {}".format(cmds.nodeType(node)))
             raise AssertionError("Unsupported file node")
@@ -500,11 +503,19 @@ class CollectLook(pyblish.api.InstancePlugin):
             self.log.debug("aiImage node")
             attribute = "{}.filename".format(node)
             computed_attribute = attribute
+        elif cmds.nodeType(node) == 'RedshiftNormalMap':
+            self.log.debug("RedshiftNormalMap node")
+            attribute = "{}.tex0".format(node)
+            computed_attribute = attribute
 
         source = cmds.getAttr(attribute)
         self.log.info("  - file source: {}".format(source))
         color_space_attr = "{}.colorSpace".format(node)
-        color_space = cmds.getAttr(color_space_attr)
+        try:
+            color_space = cmds.getAttr(color_space_attr)
+        except ValueError:
+            # node doesn't have colorspace attribute
+            color_space = "raw"
         # Compare with the computed file path, e.g. the one with the <UDIM>
         # pattern in it, to generate some logging information about this
         # difference
diff --git a/openpype/hosts/maya/plugins/publish/extract_look.py b/openpype/hosts/maya/plugins/publish/extract_look.py
index bdd061578e..f09d50d714 100644
--- a/openpype/hosts/maya/plugins/publish/extract_look.py
+++ b/openpype/hosts/maya/plugins/publish/extract_look.py
@@ -233,11 +233,14 @@ class ExtractLook(openpype.api.Extractor):
         for filepath in files_metadata:
 
             linearize = False
-            if do_maketx and files_metadata[filepath]["color_space"] == "sRGB":  # noqa: E501
+            if do_maketx and files_metadata[filepath]["color_space"].lower() == "srgb":  # noqa: E501
                 linearize = True
                 # set its file node to 'raw' as tx will be linearized
                 files_metadata[filepath]["color_space"] = "raw"
 
+            if do_maketx:
+                color_space = "raw"
+
             source, mode, texture_hash = self._process_texture(
                 filepath,
                 do_maketx,
@@ -280,14 +283,19 @@ class ExtractLook(openpype.api.Extractor):
             # This will also trigger in the same order at end of context to
             # ensure after context it's still the original value.
             color_space_attr = resource["node"] + ".colorSpace"
-            color_space = cmds.getAttr(color_space_attr)
-            if files_metadata[source]["color_space"] == "raw":
-                # set color space to raw if we linearized it
-                color_space = "Raw"
-            # Remap file node filename to destination
+            try:
+                color_space = cmds.getAttr(color_space_attr)
+            except ValueError:
+                # node doesn't have color space attribute
+                color_space = "raw"
+            else:
+                if files_metadata[source]["color_space"] == "raw":
+                    # set color space to raw if we linearized it
+                    color_space = "raw"
+                # Remap file node filename to destination
+                remap[color_space_attr] = color_space
             attr = resource["attribute"]
             remap[attr] = destinations[source]
-            remap[color_space_attr] = color_space
 
         self.log.info("Finished remapping destinations ...")
 
diff --git a/openpype/hosts/maya/plugins/publish/extract_yeti_rig.py b/openpype/hosts/maya/plugins/publish/extract_yeti_rig.py
index b9bed47fa5..56d5dfe901 100644
--- a/openpype/hosts/maya/plugins/publish/extract_yeti_rig.py
+++ b/openpype/hosts/maya/plugins/publish/extract_yeti_rig.py
@@ -133,10 +133,10 @@ class ExtractYetiRig(openpype.api.Extractor):
         image_search_path = resources_dir = instance.data["resourcesDir"]
 
         settings = instance.data.get("rigsettings", None)
-        if settings:
-            settings["imageSearchPath"] = image_search_path
-            with open(settings_path, "w") as fp:
-                json.dump(settings, fp, ensure_ascii=False)
+        assert settings, "Yeti rig settings were not collected."
+        settings["imageSearchPath"] = image_search_path
+        with open(settings_path, "w") as fp:
+            json.dump(settings, fp, ensure_ascii=False)
 
         # add textures to transfers
         if 'transfers' not in instance.data:
@@ -192,12 +192,12 @@ class ExtractYetiRig(openpype.api.Extractor):
                 'stagingDir': dirname
             }
         )
-        self.log.info("settings file: {}".format(settings))
+        self.log.info("settings file: {}".format(settings_path))
         instance.data["representations"].append(
             {
                 'name': 'rigsettings',
                 'ext': 'rigsettings',
-                'files': os.path.basename(settings),
+                'files': os.path.basename(settings_path),
                 'stagingDir': dirname
             }
         )
diff --git a/openpype/hosts/maya/plugins/publish/validate_model_name.py b/openpype/hosts/maya/plugins/publish/validate_model_name.py
index 98da4d42ba..3757e13a9b 100644
--- a/openpype/hosts/maya/plugins/publish/validate_model_name.py
+++ b/openpype/hosts/maya/plugins/publish/validate_model_name.py
@@ -1,8 +1,16 @@
+# -*- coding: utf-8 -*-
+"""Validate model nodes names."""
 from maya import cmds
 import pyblish.api
 import openpype.api
+import avalon.api
 import openpype.hosts.maya.api.action
+from openpype.hosts.maya.api.shader_definition_editor import (
+    DEFINITION_FILENAME)
+from openpype.lib.mongo import OpenPypeMongoConnection
+import gridfs
 import re
+import os
 
 
 class ValidateModelName(pyblish.api.InstancePlugin):
@@ -19,18 +27,18 @@ class ValidateModelName(pyblish.api.InstancePlugin):
     families = ["model"]
     label = "Model Name"
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction]
-    # path to shader names definitions
-    # TODO: move it to preset file
     material_file = None
-    regex = '(.*)_(\\d)*_(.*)_(GEO)'
+    database_file = DEFINITION_FILENAME
 
     @classmethod
     def get_invalid(cls, instance):
+        """Get invalid nodes."""
+        use_db = cls.database
 
-        # find out if supplied transform is group or not
-        def is_group(groupName):
+        def is_group(group_name):
+            """Find out if supplied transform is group or not."""
             try:
-                children = cmds.listRelatives(groupName, children=True)
+                children = cmds.listRelatives(group_name, children=True)
                 for child in children:
                     if not cmds.ls(child, transforms=True):
                         return False
@@ -44,29 +52,74 @@ class ValidateModelName(pyblish.api.InstancePlugin):
             cls.log.error("Instance has no nodes!")
             return True
         pass
+
+        # validate top level group name
+        assemblies = cmds.ls(content_instance, assemblies=True, long=True)
+        if len(assemblies) != 1:
+            cls.log.error("Must have exactly one top group")
+            return assemblies or True
+        top_group = assemblies[0]
+        regex = cls.top_level_regex
+        r = re.compile(regex)
+        m = r.match(top_group)
+        if m is None:
+            cls.log.error("invalid name on: {}".format(top_group))
+            cls.log.error("name doesn't match regex {}".format(regex))
+            invalid.append(top_group)
+        else:
+            if "asset" in r.groupindex:
+                if m.group("asset") != avalon.api.Session["AVALON_ASSET"]:
+                    cls.log.error("Invalid asset name in top level group.")
+                    return top_group
+            if "subset" in r.groupindex:
+                if m.group("subset") != instance.data.get("subset"):
+                    cls.log.error("Invalid subset name in top level group.")
+                    return top_group
+            if "project" in r.groupindex:
+                if m.group("project") != avalon.api.Session["AVALON_PROJECT"]:
+                    cls.log.error("Invalid project name in top level group.")
+                    return top_group
+
         descendants = cmds.listRelatives(content_instance,
                                          allDescendents=True,
                                          fullPath=True) or []
 
         descendants = cmds.ls(descendants, noIntermediate=True, long=True)
-        trns = cmds.ls(descendants, long=False, type=('transform'))
+        trns = cmds.ls(descendants, long=False, type='transform')
 
         # filter out groups
-        filter = [node for node in trns if not is_group(node)]
+        filtered = [node for node in trns if not is_group(node)]
 
         # load shader list file as utf-8
-        if cls.material_file:
-            shader_file = open(cls.material_file, "r")
-            shaders = shader_file.readlines()
+        shaders = []
+        if not use_db:
+            if cls.material_file:
+                if os.path.isfile(cls.material_file):
+                    shader_file = open(cls.material_file, "r")
+                    shaders = shader_file.readlines()
+                    shader_file.close()
+            else:
+                cls.log.error("Missing shader name definition file.")
+                return True
+        else:
+            client = OpenPypeMongoConnection.get_mongo_client()
+            fs = gridfs.GridFS(client[os.getenv("OPENPYPE_DATABASE_NAME")])
+            shader_file = fs.find_one({"filename": cls.database_file})
+            if not shader_file:
+                cls.log.error("Missing shader name definition in database.")
+                return True
+            shaders = shader_file.read().splitlines()
             shader_file.close()
 
         # strip line endings from list
         shaders = map(lambda s: s.rstrip(), shaders)
 
         # compile regex for testing names
-        r = re.compile(cls.regex)
+        regex = cls.regex
+        r = re.compile(regex)
 
-        for obj in filter:
+        for obj in filtered:
+            cls.log.info("testing: {}".format(obj))
             m = r.match(obj)
             if m is None:
                 cls.log.error("invalid name on: {}".format(obj))
@@ -74,7 +127,7 @@ class ValidateModelName(pyblish.api.InstancePlugin):
             else:
                 # if we have shader files and shader named group is in
                 # regex, test this group against names in shader file
-                if 'shader' in r.groupindex and shaders:
+                if "shader" in r.groupindex and shaders:
                     try:
                         if not m.group('shader') in shaders:
                             cls.log.error(
@@ -90,8 +143,8 @@ class ValidateModelName(pyblish.api.InstancePlugin):
         return invalid
 
     def process(self, instance):
-
+        """Plugin entry point."""
         invalid = self.get_invalid(instance)
 
         if invalid:
-            raise RuntimeError("Model naming is invalid. See log.")
+            raise RuntimeError("Model naming is invalid. See the log.")
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index d7f3fdc6ba..7e7cd27f90 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -113,6 +113,14 @@ def check_inventory_versions():
                 "_id": io.ObjectId(avalon_knob_data["representation"])
             })
 
+            # Failsafe for not finding the representation.
+            if not representation:
+                log.warning(
+                    "Could not find the representation on "
+                    "node \"{}\"".format(node.name())
+                )
+                continue
+
             # Get start frame from version data
             version = io.find_one({
                 "type": "version",
@@ -391,13 +399,14 @@ def create_write_node(name, data, input=None, prenodes=None,
         if prenodes:
             for node in prenodes:
                 # get attributes
-                name = node["name"]
+                pre_node_name = node["name"]
                 klass = node["class"]
                 knobs = node["knobs"]
                 dependent = node["dependent"]
 
                 # create node
-                now_node = nuke.createNode(klass, "name {}".format(name))
+                now_node = nuke.createNode(
+                    klass, "name {}".format(pre_node_name))
                 now_node.hideControlPanel()
 
                 # add data to knob
@@ -476,27 +485,27 @@ def create_write_node(name, data, input=None, prenodes=None,
 
     linked_knob_names.append("Render")
 
-    for name in linked_knob_names:
-        if "_grp-start_" in name:
+    for _k_name in linked_knob_names:
+        if "_grp-start_" in _k_name:
             knob = nuke.Tab_Knob(
                 "rnd_attr", "Rendering attributes", nuke.TABBEGINCLOSEDGROUP)
             GN.addKnob(knob)
-        elif "_grp-end_" in name:
+        elif "_grp-end_" in _k_name:
             knob = nuke.Tab_Knob(
                 "rnd_attr_end", "Rendering attributes", nuke.TABENDGROUP)
             GN.addKnob(knob)
         else:
-            if "___" in name:
+            if "___" in _k_name:
                 # add devider
                 GN.addKnob(nuke.Text_Knob(""))
             else:
-                # add linked knob by name
+                # add linked knob by _k_name
                 link = nuke.Link_Knob("")
-                link.makeLink(write_node.name(), name)
-                link.setName(name)
+                link.makeLink(write_node.name(), _k_name)
+                link.setName(_k_name)
 
                 # make render
-                if "Render" in name:
+                if "Render" in _k_name:
                     link.setLabel("Render Local")
                 link.setFlag(0x1000)
                 GN.addKnob(link)
@@ -1651,9 +1660,13 @@ def find_free_space_to_paste_nodes(
 def launch_workfiles_app():
     '''Function letting start workfiles after start of host
     '''
-    # get state from settings
-    open_at_start = get_current_project_settings()["nuke"].get(
-        "general", {}).get("open_workfile_at_start")
+    from openpype.lib import (
+        env_value_to_bool
+    )
+    # get all imortant settings
+    open_at_start = env_value_to_bool(
+        env_key="OPENPYPE_WORKFILE_TOOL_ON_START",
+        default=None)
 
     # return if none is defined
     if not open_at_start:
@@ -1730,3 +1743,68 @@ def process_workfile_builder():
     log.info("Opening last workfile...")
     # open workfile
     open_file(last_workfile_path)
+
+
+def recreate_instance(origin_node, avalon_data=None):
+    """Recreate input instance to different data
+
+    Args:
+        origin_node (nuke.Node): Nuke node to be recreating from
+        avalon_data (dict, optional): data to be used in new node avalon_data
+
+    Returns:
+        nuke.Node: newly created node
+    """
+    knobs_wl = ["render", "publish", "review", "ypos",
+                "use_limit", "first", "last"]
+    # get data from avalon knobs
+    data = anlib.get_avalon_knob_data(
+        origin_node)
+
+    # add input data to avalon data
+    if avalon_data:
+        data.update(avalon_data)
+
+    # capture all node knobs allowed in op_knobs
+    knobs_data = {k: origin_node[k].value()
+                  for k in origin_node.knobs()
+                  for key in knobs_wl
+                  if key in k}
+
+    # get node dependencies
+    inputs = origin_node.dependencies()
+    outputs = origin_node.dependent()
+
+    # remove the node
+    nuke.delete(origin_node)
+
+    # create new node
+    # get appropriate plugin class
+    creator_plugin = None
+    for Creator in api.discover(api.Creator):
+        if Creator.__name__ == data["creator"]:
+            creator_plugin = Creator
+            break
+
+    # create write node with creator
+    new_node_name = data["subset"]
+    new_node = creator_plugin(new_node_name, data["asset"]).process()
+
+    # white listed knobs to the new node
+    for _k, _v in knobs_data.items():
+        try:
+            print(_k, _v)
+            new_node[_k].setValue(_v)
+        except Exception as e:
+            print(e)
+
+    # connect to original inputs
+    for i, n in enumerate(inputs):
+        new_node.setInput(i, n)
+
+    # connect to outputs
+    if len(outputs) > 0:
+        for dn in outputs:
+            dn.setInput(0, new_node)
+
+    return new_node
diff --git a/openpype/hosts/nuke/plugins/load/load_effects.py b/openpype/hosts/nuke/plugins/load/load_effects.py
index 6306767f37..8ba1b6b7c1 100644
--- a/openpype/hosts/nuke/plugins/load/load_effects.py
+++ b/openpype/hosts/nuke/plugins/load/load_effects.py
@@ -214,7 +214,7 @@ class LoadEffects(api.Loader):
                         self.log.warning(e)
                         continue
 
-                    if isinstance(v, list) and len(v) > 3:
+                    if isinstance(v, list) and len(v) > 4:
                         node[k].setAnimated()
                         for i, value in enumerate(v):
                             if isinstance(value, list):
diff --git a/openpype/hosts/nuke/plugins/load/load_effects_ip.py b/openpype/hosts/nuke/plugins/load/load_effects_ip.py
index 6c71f2ae16..d0cab26842 100644
--- a/openpype/hosts/nuke/plugins/load/load_effects_ip.py
+++ b/openpype/hosts/nuke/plugins/load/load_effects_ip.py
@@ -217,7 +217,7 @@ class LoadEffectsInputProcess(api.Loader):
                         self.log.warning(e)
                         continue
 
-                    if isinstance(v, list) and len(v) > 3:
+                    if isinstance(v, list) and len(v) > 4:
                         node[k].setAnimated()
                         for i, value in enumerate(v):
                             if isinstance(value, list):
@@ -239,10 +239,10 @@ class LoadEffectsInputProcess(api.Loader):
             output = nuke.createNode("Output")
             output.setInput(0, pre_node)
 
-        # try to place it under Viewer1
-        if not self.connect_active_viewer(GN):
-            nuke.delete(GN)
-            return
+        # # try to place it under Viewer1
+        # if not self.connect_active_viewer(GN):
+        #     nuke.delete(GN)
+        #     return
 
         # get all versions in list
         versions = io.find({
@@ -298,7 +298,11 @@ class LoadEffectsInputProcess(api.Loader):
         viewer["input_process_node"].setValue(group_node_name)
 
         # put backdrop under
-        lib.create_backdrop(label="Input Process", layer=2, nodes=[viewer, group_node], color="0x7c7faaff")
+        lib.create_backdrop(
+            label="Input Process",
+            layer=2,
+            nodes=[viewer, group_node],
+            color="0x7c7faaff")
 
         return True
 
diff --git a/openpype/hosts/nuke/plugins/load/load_mov.py b/openpype/hosts/nuke/plugins/load/load_mov.py
index d84c3d4c71..f7523d0a6e 100644
--- a/openpype/hosts/nuke/plugins/load/load_mov.py
+++ b/openpype/hosts/nuke/plugins/load/load_mov.py
@@ -259,7 +259,8 @@ class LoadMov(api.Loader):
         read_node["last"].setValue(last)
         read_node['frame_mode'].setValue("start at")
 
-        if int(self.first_frame) == int(read_node['frame'].value()):
+        if int(float(self.first_frame)) == int(
+                float(read_node['frame'].value())):
             # start at workfile start
             read_node['frame'].setValue(str(self.first_frame))
         else:
diff --git a/openpype/hosts/nuke/plugins/publish/extract_review_data_lut.py b/openpype/hosts/nuke/plugins/publish/extract_review_data_lut.py
index 5611591b56..b0d3ec6241 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_review_data_lut.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_review_data_lut.py
@@ -51,7 +51,6 @@ class ExtractReviewDataLut(openpype.api.Extractor):
 
         if "render.farm" in families:
             instance.data["families"].remove("review")
-            instance.data["families"].remove("ftrack")
 
         self.log.debug(
             "_ lutPath: {}".format(instance.data["lutPath"]))
diff --git a/openpype/hosts/nuke/plugins/publish/extract_review_data_mov.py b/openpype/hosts/nuke/plugins/publish/extract_review_data_mov.py
index 5032e602a2..cea7d86c26 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_review_data_mov.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_review_data_mov.py
@@ -45,7 +45,6 @@ class ExtractReviewDataMov(openpype.api.Extractor):
 
             if "render.farm" in families:
                 instance.data["families"].remove("review")
-                instance.data["families"].remove("ftrack")
                 data = exporter.generate_mov(farm=True)
 
                 self.log.debug(
diff --git a/openpype/hosts/nuke/plugins/publish/precollect_instances.py b/openpype/hosts/nuke/plugins/publish/precollect_instances.py
index 00d96c6cd1..c2c25d0627 100644
--- a/openpype/hosts/nuke/plugins/publish/precollect_instances.py
+++ b/openpype/hosts/nuke/plugins/publish/precollect_instances.py
@@ -70,8 +70,9 @@ class PreCollectNukeInstances(pyblish.api.ContextPlugin):
             review = False
             if "review" in node.knobs():
                 review = node["review"].value()
+
+            if review:
                 families.append("review")
-                families.append("ftrack")
 
             # Add all nodes in group instances.
             if node.Class() == "Group":
@@ -81,18 +82,18 @@ class PreCollectNukeInstances(pyblish.api.ContextPlugin):
                     if target == "Use existing frames":
                         # Local rendering
                         self.log.info("flagged for no render")
-                        families.append(family)
+                        families.append(families_ak.lower())
                     elif target == "Local":
                         # Local rendering
                         self.log.info("flagged for local render")
                         families.append("{}.local".format(family))
+                        family = families_ak.lower()
                     elif target == "On farm":
                         # Farm rendering
                         self.log.info("flagged for farm render")
                         instance.data["transfer"] = False
                         families.append("{}.farm".format(family))
-
-                    family = families_ak.lower()
+                        family = families_ak.lower()
 
                 node.begin()
                 for i in nuke.allNodes():
diff --git a/openpype/hosts/photoshop/plugins/publish/validate_instance_asset.py b/openpype/hosts/photoshop/plugins/publish/validate_instance_asset.py
index a1de02f319..4dc1972074 100644
--- a/openpype/hosts/photoshop/plugins/publish/validate_instance_asset.py
+++ b/openpype/hosts/photoshop/plugins/publish/validate_instance_asset.py
@@ -1,5 +1,4 @@
-import os
-
+from avalon import api
 import pyblish.api
 import openpype.api
 from avalon import photoshop
@@ -27,12 +26,20 @@ class ValidateInstanceAssetRepair(pyblish.api.Action):
         for instance in instances:
             data = stub.read(instance[0])
 
-            data["asset"] = os.environ["AVALON_ASSET"]
+            data["asset"] = api.Session["AVALON_ASSET"]
             stub.imprint(instance[0], data)
 
 
 class ValidateInstanceAsset(pyblish.api.InstancePlugin):
-    """Validate the instance asset is the current asset."""
+    """Validate the instance asset is the current selected context asset.
+
+        As it might happen that multiple worfiles are opened, switching
+        between them would mess with selected context.
+        In that case outputs might be output under wrong asset!
+
+        Repair action will use Context asset value (from Workfiles or Launcher)
+        Closing and reopening with Workfiles will refresh  Context value.
+    """
 
     label = "Validate Instance Asset"
     hosts = ["photoshop"]
@@ -41,9 +48,12 @@ class ValidateInstanceAsset(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         instance_asset = instance.data["asset"]
-        current_asset = os.environ["AVALON_ASSET"]
+        current_asset = api.Session["AVALON_ASSET"]
         msg = (
-            "Instance asset is not the same as current asset:"
-            f"\nInstance: {instance_asset}\nCurrent: {current_asset}"
+            f"Instance asset {instance_asset} is not the same "
+            f"as current context {current_asset}. PLEASE DO:\n"
+            f"Repair with 'A' action to use '{current_asset}'.\n"
+            f"If that's not correct value, close workfile and "
+            f"reopen via Workfiles!"
         )
         assert instance_asset == current_asset, msg
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial.py
index fc9d95d3d7..0a1d29ccdc 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial.py
@@ -2,7 +2,7 @@
 Optional:
     presets     -> extensions (
         example of use:
-            [".mov", ".mp4"]
+            ["mov", "mp4"]
     )
     presets     -> source_dir (
         example of use:
@@ -11,6 +11,7 @@ Optional:
             "{root[work]}/{project[name]}/inputs"
             "./input"
             "../input"
+            ""
     )
 """
 
@@ -48,7 +49,7 @@ class CollectEditorial(pyblish.api.InstancePlugin):
     actions = []
 
     # presets
-    extensions = [".mov", ".mp4"]
+    extensions = ["mov", "mp4"]
     source_dir = None
 
     def process(self, instance):
@@ -72,7 +73,7 @@ class CollectEditorial(pyblish.api.InstancePlugin):
             video_path = None
             basename = os.path.splitext(os.path.basename(file_path))[0]
 
-            if self.source_dir:
+            if self.source_dir != "":
                 source_dir = self.source_dir.replace("\\", "/")
                 if ("./" in source_dir) or ("../" in source_dir):
                     # get current working dir
@@ -98,7 +99,7 @@ class CollectEditorial(pyblish.api.InstancePlugin):
                     if os.path.splitext(f)[0] not in basename:
                         continue
                     # filter out by respected extensions
-                    if os.path.splitext(f)[1] not in self.extensions:
+                    if os.path.splitext(f)[1][1:] not in self.extensions:
                         continue
                     video_path = os.path.join(
                         staging_dir, f
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_instances.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
similarity index 91%
rename from openpype/hosts/standalonepublisher/plugins/publish/collect_instances.py
rename to openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
index d753a3d9bb..3a9a7a3445 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_instances.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
@@ -8,7 +8,7 @@ class CollectInstances(pyblish.api.InstancePlugin):
     """Collect instances from editorial's OTIO sequence"""
 
     order = pyblish.api.CollectorOrder + 0.01
-    label = "Collect Instances"
+    label = "Collect Editorial Instances"
     hosts = ["standalonepublisher"]
     families = ["editorial"]
 
@@ -17,16 +17,12 @@ class CollectInstances(pyblish.api.InstancePlugin):
         "referenceMain": {
             "family": "review",
             "families": ["clip"],
-            "extensions": [".mp4"]
+            "extensions": ["mp4"]
         },
         "audioMain": {
             "family": "audio",
             "families": ["clip"],
-            "extensions": [".wav"],
-        },
-        "shotMain": {
-            "family": "shot",
-            "families": []
+            "extensions": ["wav"],
         }
     }
     timeline_frame_start = 900000  # starndard edl default (10:00:00:00)
@@ -55,7 +51,7 @@ class CollectInstances(pyblish.api.InstancePlugin):
         fps = plib.get_asset()["data"]["fps"]
 
         tracks = timeline.each_child(
-            descended_from_type=otio.schema.track.Track
+            descended_from_type=otio.schema.Track
         )
 
         # get data from avalon
@@ -84,6 +80,9 @@ class CollectInstances(pyblish.api.InstancePlugin):
                 if clip.name is None:
                     continue
 
+                if isinstance(clip, otio.schema.Gap):
+                    continue
+
                 # skip all generators like black ampty
                 if isinstance(
                     clip.media_reference,
@@ -92,7 +91,7 @@ class CollectInstances(pyblish.api.InstancePlugin):
 
                 # Transitions are ignored, because Clips have the full frame
                 # range.
-                if isinstance(clip, otio.schema.transition.Transition):
+                if isinstance(clip, otio.schema.Transition):
                     continue
 
                 # basic unique asset name
@@ -175,7 +174,17 @@ class CollectInstances(pyblish.api.InstancePlugin):
                         data_key: instance.data.get(data_key)})
 
                 # adding subsets to context as instances
+                self.subsets.update({
+                    "shotMain": {
+                        "family": "shot",
+                        "families": []
+                    }
+                })
                 for subset, properities in self.subsets.items():
+                    version = properities.get("version")
+                    if version == 0:
+                        properities.pop("version")
+
                     # adding Review-able instance
                     subset_instance_data = instance_data.copy()
                     subset_instance_data.update(properities)
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_instance_resources.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_resources.py
similarity index 94%
rename from openpype/hosts/standalonepublisher/plugins/publish/collect_instance_resources.py
rename to openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_resources.py
index 565d066fd8..ffa24cfd93 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_instance_resources.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_resources.py
@@ -11,7 +11,7 @@ class CollectInstanceResources(pyblish.api.InstancePlugin):
 
     # must be after `CollectInstances`
     order = pyblish.api.CollectorOrder + 0.011
-    label = "Collect Instance Resources"
+    label = "Collect Editorial Resources"
     hosts = ["standalonepublisher"]
     families = ["clip"]
 
@@ -177,19 +177,23 @@ class CollectInstanceResources(pyblish.api.InstancePlugin):
         collection_head_name = None
         # loop trough collections and create representations
         for _collection in collections:
-            ext = _collection.tail
+            ext = _collection.tail[1:]
             collection_head_name = _collection.head
             frame_start = list(_collection.indexes)[0]
             frame_end = list(_collection.indexes)[-1]
             repre_data = {
                 "frameStart": frame_start,
                 "frameEnd": frame_end,
-                "name": ext[1:],
-                "ext": ext[1:],
+                "name": ext,
+                "ext": ext,
                 "files": [item for item in _collection],
                 "stagingDir": staging_dir
             }
 
+            if instance_data.get("keepSequence"):
+                repre_data_keep = deepcopy(repre_data)
+                instance_data["representations"].append(repre_data_keep)
+
             if "review" in instance_data["families"]:
                 repre_data.update({
                     "thumbnail": True,
@@ -208,20 +212,20 @@ class CollectInstanceResources(pyblish.api.InstancePlugin):
 
         # loop trough reminders and create representations
         for _reminding_file in remainder:
-            ext = os.path.splitext(_reminding_file)[-1]
+            ext = os.path.splitext(_reminding_file)[-1][1:]
             if ext not in instance_data["extensions"]:
                 continue
             if collection_head_name and (
-                (collection_head_name + ext[1:]) not in _reminding_file
-            ) and (ext in [".mp4", ".mov"]):
+                (collection_head_name + ext) not in _reminding_file
+            ) and (ext in ["mp4", "mov"]):
                 self.log.info(f"Skipping file: {_reminding_file}")
                 continue
             frame_start = 1
             frame_end = 1
 
             repre_data = {
-                "name": ext[1:],
-                "ext": ext[1:],
+                "name": ext,
+                "ext": ext,
                 "files": _reminding_file,
                 "stagingDir": staging_dir
             }
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
index be36f30f4b..acad98d784 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
@@ -37,7 +37,7 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin):
 
         # return if any
         if entity_type:
-            return {"entityType": entity_type, "entityName": value}
+            return {"entity_type": entity_type, "entity_name": value}
 
     def rename_with_hierarchy(self, instance):
         search_text = ""
@@ -76,8 +76,8 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin):
         # add current selection context hierarchy from standalonepublisher
         for entity in reversed(visual_hierarchy):
             parents.append({
-                "entityType": entity["data"]["entityType"],
-                "entityName": entity["name"]
+                "entity_type": entity["data"]["entityType"],
+                "entity_name": entity["name"]
             })
 
         if self.shot_add_hierarchy:
@@ -98,7 +98,7 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin):
 
                 # in case SP context is set to the same folder
                 if (_index == 0) and ("folder" in parent_key) \
-                        and (parents[-1]["entityName"] == parent_filled):
+                        and (parents[-1]["entity_name"] == parent_filled):
                     self.log.debug(f" skiping : {parent_filled}")
                     continue
 
@@ -131,20 +131,21 @@ class CollectHierarchyInstance(pyblish.api.ContextPlugin):
             tasks_to_add = dict()
             project_tasks = io.find_one({"type": "project"})["config"]["tasks"]
             for task_name, task_data in self.shot_add_tasks.items():
-                try:
-                    if task_data["type"] in project_tasks.keys():
-                        tasks_to_add.update({task_name: task_data})
-                    else:
-                        raise KeyError(
-                            "Wrong FtrackTaskType `{}` for `{}` is not"
-                            " existing in `{}``".format(
-                                task_data["type"],
-                                task_name,
-                                list(project_tasks.keys())))
-                except KeyError as error:
+                _task_data = deepcopy(task_data)
+
+                # fixing enumerator from settings
+                _task_data["type"] = task_data["type"][0]
+
+                # check if task type in project task types
+                if _task_data["type"] in project_tasks.keys():
+                    tasks_to_add.update({task_name: _task_data})
+                else:
                     raise KeyError(
-                        "Wrong presets: `{0}`".format(error)
-                    )
+                        "Wrong FtrackTaskType `{}` for `{}` is not"
+                        " existing in `{}``".format(
+                            _task_data["type"],
+                            task_name,
+                            list(project_tasks.keys())))
 
             instance.data["tasks"] = tasks_to_add
         else:
@@ -279,9 +280,9 @@ class CollectHierarchyContext(pyblish.api.ContextPlugin):
 
             for parent in reversed(parents):
                 next_dict = {}
-                parent_name = parent["entityName"]
+                parent_name = parent["entity_name"]
                 next_dict[parent_name] = {}
-                next_dict[parent_name]["entity_type"] = parent["entityType"]
+                next_dict[parent_name]["entity_type"] = parent["entity_type"]
                 next_dict[parent_name]["childs"] = actual
                 actual = next_dict
 
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_texture.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_texture.py
new file mode 100644
index 0000000000..596a8ccfd2
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_texture.py
@@ -0,0 +1,457 @@
+import os
+import re
+import pyblish.api
+import json
+
+from avalon.api import format_template_with_optional_keys
+
+from openpype.lib import prepare_template_data
+
+
+class CollectTextures(pyblish.api.ContextPlugin):
+    """Collect workfile (and its resource_files) and textures.
+
+        Currently implements use case with Mari and Substance Painter, where
+        one workfile is main (.mra - Mari) with possible additional workfiles
+        (.spp - Substance)
+
+
+        Provides:
+            1 instance per workfile (with 'resources' filled if needed)
+                (workfile family)
+            1 instance per group of textures
+                (textures family)
+    """
+
+    order = pyblish.api.CollectorOrder
+    label = "Collect Textures"
+    hosts = ["standalonepublisher"]
+    families = ["texture_batch"]
+    actions = []
+
+    # from presets
+    main_workfile_extensions = ['mra']
+    other_workfile_extensions = ['spp', 'psd']
+    texture_extensions = ["exr", "dpx", "jpg", "jpeg", "png", "tiff", "tga",
+                          "gif", "svg"]
+
+    # additional families (ftrack etc.)
+    workfile_families = []
+    textures_families = []
+
+    color_space = ["linsRGB", "raw", "acesg"]
+
+    # currently implemented placeholders ["color_space"]
+    # describing patterns in file names splitted by regex groups
+    input_naming_patterns = {
+        # workfile: corridorMain_v001.mra >
+        # texture: corridorMain_aluminiumID_v001_baseColor_linsRGB_1001.exr
+        "workfile": r'^([^.]+)(_[^_.]*)?_v([0-9]{3,}).+',
+        "textures": r'^([^_.]+)_([^_.]+)_v([0-9]{3,})_([^_.]+)_({color_space})_(1[0-9]{3}).+', # noqa
+    }
+    # matching regex group position to 'input_naming_patterns'
+    input_naming_groups = {
+        "workfile": ('asset', 'filler', 'version'),
+        "textures": ('asset', 'shader', 'version', 'channel', 'color_space',
+                     'udim')
+    }
+
+    workfile_subset_template = "textures{Subset}Workfile"
+    # implemented keys: ["color_space", "channel", "subset", "shader"]
+    texture_subset_template = "textures{Subset}_{Shader}_{Channel}"
+
+    def process(self, context):
+        self.context = context
+
+        resource_files = {}
+        workfile_files = {}
+        representations = {}
+        version_data = {}
+        asset_builds = set()
+        asset = None
+        for instance in context:
+            if not self.input_naming_patterns:
+                raise ValueError("Naming patterns are not configured. \n"
+                                 "Ask admin to provide naming conventions "
+                                 "for workfiles and textures.")
+
+            if not asset:
+                asset = instance.data["asset"]  # selected from SP
+
+            parsed_subset = instance.data["subset"].replace(
+                instance.data["family"], '')
+
+            fill_pairs = {
+                "subset": parsed_subset
+            }
+
+            fill_pairs = prepare_template_data(fill_pairs)
+            workfile_subset = format_template_with_optional_keys(
+                fill_pairs, self.workfile_subset_template)
+
+            processed_instance = False
+            for repre in instance.data["representations"]:
+                ext = repre["ext"].replace('.', '')
+                asset_build = version = None
+
+                if isinstance(repre["files"], list):
+                    repre_file = repre["files"][0]
+                else:
+                    repre_file = repre["files"]
+
+                if ext in self.main_workfile_extensions or \
+                        ext in self.other_workfile_extensions:
+
+                    asset_build = self._get_asset_build(
+                        repre_file,
+                        self.input_naming_patterns["workfile"],
+                        self.input_naming_groups["workfile"],
+                        self.color_space
+                    )
+                    version = self._get_version(
+                        repre_file,
+                        self.input_naming_patterns["workfile"],
+                        self.input_naming_groups["workfile"],
+                        self.color_space
+                    )
+                    asset_builds.add((asset_build, version,
+                                      workfile_subset, 'workfile'))
+                    processed_instance = True
+
+                    if not representations.get(workfile_subset):
+                        representations[workfile_subset] = []
+
+                if ext in self.main_workfile_extensions:
+                    # workfiles can have only single representation
+                    # currently OP is not supporting different extensions in
+                    # representation files
+                    representations[workfile_subset] = [repre]
+
+                    workfile_files[asset_build] = repre_file
+
+                if ext in self.other_workfile_extensions:
+                    # add only if not added already from main
+                    if not representations.get(workfile_subset):
+                        representations[workfile_subset] = [repre]
+
+                    # only overwrite if not present
+                    if not workfile_files.get(asset_build):
+                        workfile_files[asset_build] = repre_file
+
+                    if not resource_files.get(workfile_subset):
+                        resource_files[workfile_subset] = []
+                    item = {
+                        "files": [os.path.join(repre["stagingDir"],
+                                               repre["files"])],
+                        "source": "standalone publisher"
+                    }
+                    resource_files[workfile_subset].append(item)
+
+                if ext in self.texture_extensions:
+                    c_space = self._get_color_space(
+                        repre_file,
+                        self.color_space
+                    )
+
+                    channel = self._get_channel_name(
+                        repre_file,
+                        self.input_naming_patterns["textures"],
+                        self.input_naming_groups["textures"],
+                        self.color_space
+                    )
+
+                    shader = self._get_shader_name(
+                        repre_file,
+                        self.input_naming_patterns["textures"],
+                        self.input_naming_groups["textures"],
+                        self.color_space
+                    )
+
+                    formatting_data = {
+                        "color_space": c_space or '',  # None throws exception
+                        "channel": channel or '',
+                        "shader": shader or '',
+                        "subset": parsed_subset or ''
+                    }
+
+                    fill_pairs = prepare_template_data(formatting_data)
+                    subset = format_template_with_optional_keys(
+                        fill_pairs, self.texture_subset_template)
+
+                    asset_build = self._get_asset_build(
+                        repre_file,
+                        self.input_naming_patterns["textures"],
+                        self.input_naming_groups["textures"],
+                        self.color_space
+                    )
+                    version = self._get_version(
+                        repre_file,
+                        self.input_naming_patterns["textures"],
+                        self.input_naming_groups["textures"],
+                        self.color_space
+                    )
+                    if not representations.get(subset):
+                        representations[subset] = []
+                    representations[subset].append(repre)
+
+                    ver_data = {
+                        "color_space": c_space or '',
+                        "channel_name": channel or '',
+                        "shader_name": shader or ''
+                    }
+                    version_data[subset] = ver_data
+
+                    asset_builds.add(
+                        (asset_build, version, subset, "textures"))
+                    processed_instance = True
+
+            if processed_instance:
+                self.context.remove(instance)
+
+        self._create_new_instances(context,
+                                   asset,
+                                   asset_builds,
+                                   resource_files,
+                                   representations,
+                                   version_data,
+                                   workfile_files)
+
+    def _create_new_instances(self, context, asset, asset_builds,
+                              resource_files, representations,
+                              version_data, workfile_files):
+        """Prepare new instances from collected data.
+
+            Args:
+                context (ContextPlugin)
+                asset (string): selected asset from SP
+                asset_builds (set) of tuples
+                    (asset_build, version, subset, family)
+                resource_files (list) of resource dicts - to store additional
+                  files to main workfile
+                representations (list) of dicts - to store workfile info OR
+                   all collected texture files, key is asset_build
+                version_data (dict) - prepared to store into version doc in DB
+                workfile_files (dict) - to store workfile to add to textures
+                    key is asset_build
+        """
+        # sort workfile first
+        asset_builds = sorted(asset_builds,
+                              key=lambda tup: tup[3], reverse=True)
+
+        # workfile must have version, textures might
+        main_version = None
+        for asset_build, version, subset, family in asset_builds:
+            if not main_version:
+                main_version = version
+            new_instance = context.create_instance(subset)
+            new_instance.data.update(
+                {
+                    "subset": subset,
+                    "asset": asset,
+                    "label": subset,
+                    "name": subset,
+                    "family": family,
+                    "version": int(version or main_version or 1),
+                    "asset_build": asset_build  # remove in validator
+                }
+            )
+
+            workfile = workfile_files.get(asset_build)
+
+            if resource_files.get(subset):
+                # add resources only when workfile is main style
+                for ext in self.main_workfile_extensions:
+                    if ext in workfile:
+                        new_instance.data.update({
+                            "resources": resource_files.get(subset)
+                        })
+                        break
+
+            # store origin
+            if family == 'workfile':
+                families = self.workfile_families
+                families.append("texture_batch_workfile")
+
+                new_instance.data["source"] = "standalone publisher"
+            else:
+                families = self.textures_families
+
+                repre = representations.get(subset)[0]
+                new_instance.context.data["currentFile"] = os.path.join(
+                    repre["stagingDir"], workfile or 'dummy.txt')
+
+            new_instance.data["families"] = families
+
+            # add data for version document
+            ver_data = version_data.get(subset)
+            if ver_data:
+                if workfile:
+                    ver_data['workfile'] = workfile
+
+                new_instance.data.update(
+                    {"versionData": ver_data}
+                )
+
+            upd_representations = representations.get(subset)
+            if upd_representations and family != 'workfile':
+                upd_representations = self._update_representations(
+                    upd_representations)
+
+            new_instance.data["representations"] = upd_representations
+
+            self.log.debug("new instance - {}:: {}".format(
+                family,
+                json.dumps(new_instance.data, indent=4)))
+
+    def _get_asset_build(self, name,
+                         input_naming_patterns, input_naming_groups,
+                         color_spaces):
+        """Loops through configured workfile patterns to find asset name.
+
+            Asset name used to bind workfile and its textures.
+
+            Args:
+                name (str): workfile name
+                input_naming_patterns (list):
+                    [workfile_pattern] or [texture_pattern]
+                input_naming_groups (list)
+                    ordinal position of regex groups matching to input_naming..
+                color_spaces (list) - predefined color spaces
+        """
+        asset_name = "NOT_AVAIL"
+
+        return self._parse(name, input_naming_patterns, input_naming_groups,
+                           color_spaces, 'asset') or asset_name
+
+    def _get_version(self, name, input_naming_patterns, input_naming_groups,
+                     color_spaces):
+        found = self._parse(name, input_naming_patterns, input_naming_groups,
+                            color_spaces, 'version')
+
+        if found:
+            return found.replace('v', '')
+
+        self.log.info("No version found in the name {}".format(name))
+
+    def _get_udim(self, name, input_naming_patterns, input_naming_groups,
+                  color_spaces):
+        """Parses from 'name' udim value."""
+        found = self._parse(name, input_naming_patterns, input_naming_groups,
+                            color_spaces, 'udim')
+        if found:
+            return found
+
+        self.log.warning("Didn't find UDIM in {}".format(name))
+
+    def _get_color_space(self, name, color_spaces):
+        """Looks for color_space from a list in a file name.
+
+            Color space seems not to be recognizable by regex pattern, set of
+            known space spaces must be provided.
+        """
+        color_space = None
+        found = [cs for cs in color_spaces if
+                 re.search("_{}_".format(cs), name)]
+
+        if not found:
+            self.log.warning("No color space found in {}".format(name))
+        else:
+            if len(found) > 1:
+                msg = "Multiple color spaces found in {}->{}".format(name,
+                                                                     found)
+                self.log.warning(msg)
+
+            color_space = found[0]
+
+        return color_space
+
+    def _get_shader_name(self, name, input_naming_patterns,
+                         input_naming_groups, color_spaces):
+        """Return parsed shader name.
+
+            Shader name is needed for overlapping udims (eg. udims might be
+            used for different materials, shader needed to not overwrite).
+
+            Unknown format of channel name and color spaces >> cs are known
+            list - 'color_space' used as a placeholder
+        """
+        found = self._parse(name, input_naming_patterns, input_naming_groups,
+                            color_spaces, 'shader')
+        if found:
+            return found
+
+        self.log.warning("Didn't find shader in {}".format(name))
+
+    def _get_channel_name(self, name, input_naming_patterns,
+                          input_naming_groups, color_spaces):
+        """Return parsed channel name.
+
+            Unknown format of channel name and color spaces >> cs are known
+            list - 'color_space' used as a placeholder
+        """
+        found = self._parse(name, input_naming_patterns, input_naming_groups,
+                            color_spaces, 'channel')
+        if found:
+            return found
+
+        self.log.warning("Didn't find channel in {}".format(name))
+
+    def _parse(self, name, input_naming_patterns, input_naming_groups,
+               color_spaces, key):
+        """Universal way to parse 'name' with configurable regex groups.
+
+            Args:
+                name (str): workfile name
+                input_naming_patterns (list):
+                    [workfile_pattern] or [texture_pattern]
+                input_naming_groups (list)
+                    ordinal position of regex groups matching to input_naming..
+                color_spaces (list) - predefined color spaces
+
+            Raises:
+                ValueError - if broken 'input_naming_groups'
+        """
+        for input_pattern in input_naming_patterns:
+            for cs in color_spaces:
+                pattern = input_pattern.replace('{color_space}', cs)
+                regex_result = re.findall(pattern, name)
+                if regex_result:
+                    idx = list(input_naming_groups).index(key)
+                    if idx < 0:
+                        msg = "input_naming_groups must " +\
+                              "have '{}' key".format(key)
+                        raise ValueError(msg)
+
+                    try:
+                        parsed_value = regex_result[0][idx]
+                        return parsed_value
+                    except IndexError:
+                        self.log.warning("Wrong index, probably "
+                                         "wrong name {}".format(name))
+
+    def _update_representations(self, upd_representations):
+        """Frames dont have sense for textures, add collected udims instead."""
+        udims = []
+        for repre in upd_representations:
+            repre.pop("frameStart", None)
+            repre.pop("frameEnd", None)
+            repre.pop("fps", None)
+
+            # ignore unique name from SP, use extension instead
+            # SP enforces unique name, here different subsets >> unique repres
+            repre["name"] = repre["ext"].replace('.', '')
+
+            files = repre.get("files", [])
+            if not isinstance(files, list):
+                files = [files]
+
+            for file_name in files:
+                udim = self._get_udim(file_name,
+                                      self.input_naming_patterns["textures"],
+                                      self.input_naming_groups["textures"],
+                                      self.color_space)
+                udims.append(udim)
+
+            repre["udim"] = udims  # must be this way, used for filling path
+
+        return upd_representations
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/extract_resources.py b/openpype/hosts/standalonepublisher/plugins/publish/extract_resources.py
new file mode 100644
index 0000000000..1183180833
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/extract_resources.py
@@ -0,0 +1,42 @@
+import os
+import pyblish.api
+
+
+class ExtractResources(pyblish.api.InstancePlugin):
+    """
+        Extracts files from instance.data["resources"].
+
+        These files are additional (textures etc.), currently not stored in
+        representations!
+
+        Expects collected 'resourcesDir'. (list of dicts with 'files' key and
+            list of source urls)
+
+        Provides filled 'transfers' (list of tuples (source_url, target_url))
+    """
+
+    label = "Extract Resources SP"
+    hosts = ["standalonepublisher"]
+    order = pyblish.api.ExtractorOrder
+
+    families = ["workfile"]
+
+    def process(self, instance):
+        if not instance.data.get("resources"):
+            self.log.info("No resources")
+            return
+
+        if not instance.data.get("transfers"):
+            instance.data["transfers"] = []
+
+        publish_dir = instance.data["resourcesDir"]
+
+        transfers = []
+        for resource in instance.data["resources"]:
+            for file_url in resource.get("files", []):
+                file_name = os.path.basename(file_url)
+                dest_url = os.path.join(publish_dir, file_name)
+                transfers.append((file_url, dest_url))
+
+        self.log.info("transfers:: {}".format(transfers))
+        instance.data["transfers"].extend(transfers)
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/extract_trim_video_audio.py b/openpype/hosts/standalonepublisher/plugins/publish/extract_trim_video_audio.py
index eb613fa951..059ac9603c 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/extract_trim_video_audio.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/extract_trim_video_audio.py
@@ -60,7 +60,7 @@ class ExtractTrimVideoAudio(openpype.api.Extractor):
                 ]
 
             args = [
-                ffmpeg_path,
+                f"\"{ffmpeg_path}\"",
                 "-ss", str(start / fps),
                 "-i", f"\"{video_file_path}\"",
                 "-t", str(dur / fps)
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/extract_workfile_location.py b/openpype/hosts/standalonepublisher/plugins/publish/extract_workfile_location.py
new file mode 100644
index 0000000000..18bf0394ae
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/extract_workfile_location.py
@@ -0,0 +1,43 @@
+import os
+import pyblish.api
+
+
+class ExtractWorkfileUrl(pyblish.api.ContextPlugin):
+    """
+        Modifies 'workfile' field to contain link to published workfile.
+
+        Expects that batch contains only single workfile and matching
+        (multiple) textures.
+    """
+
+    label = "Extract Workfile Url SP"
+    hosts = ["standalonepublisher"]
+    order = pyblish.api.ExtractorOrder
+
+    families = ["textures"]
+
+    def process(self, context):
+        filepath = None
+
+        # first loop for workfile
+        for instance in context:
+            if instance.data["family"] == 'workfile':
+                anatomy = context.data['anatomy']
+                template_data = instance.data.get("anatomyData")
+                rep_name = instance.data.get("representations")[0].get("name")
+                template_data["representation"] = rep_name
+                template_data["ext"] = rep_name
+                anatomy_filled = anatomy.format(template_data)
+                template_filled = anatomy_filled["publish"]["path"]
+                filepath = os.path.normpath(template_filled)
+                self.log.info("Using published scene for render {}".format(
+                    filepath))
+
+        if not filepath:
+            self.log.info("Texture batch doesn't contain workfile.")
+            return
+
+        # then apply to all textures
+        for instance in context:
+            if instance.data["family"] == 'textures':
+                instance.data["versionData"]["workfile"] = filepath
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_batch.py b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_batch.py
new file mode 100644
index 0000000000..d592a4a059
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_batch.py
@@ -0,0 +1,22 @@
+import pyblish.api
+import openpype.api
+
+
+class ValidateTextureBatch(pyblish.api.InstancePlugin):
+    """Validates that some texture files are present."""
+
+    label = "Validate Texture Presence"
+    hosts = ["standalonepublisher"]
+    order = openpype.api.ValidateContentsOrder
+    families = ["texture_batch_workfile"]
+    optional = False
+
+    def process(self, instance):
+        present = False
+        for instance in instance.context:
+            if instance.data["family"] == "textures":
+                self.log.info("Some textures present.")
+
+                return
+
+        assert present, "No textures found in published batch!"
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_has_workfile.py b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_has_workfile.py
new file mode 100644
index 0000000000..7cd540668c
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_has_workfile.py
@@ -0,0 +1,20 @@
+import pyblish.api
+import openpype.api
+
+
+class ValidateTextureHasWorkfile(pyblish.api.InstancePlugin):
+    """Validates that textures have appropriate workfile attached.
+
+        Workfile is optional, disable this Validator after Refresh if you are
+        sure it is not needed.
+    """
+    label = "Validate Texture Has Workfile"
+    hosts = ["standalonepublisher"]
+    order = openpype.api.ValidateContentsOrder
+    families = ["textures"]
+    optional = True
+
+    def process(self, instance):
+        wfile = instance.data["versionData"].get("workfile")
+
+        assert wfile, "Textures are missing attached workfile"
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_name.py b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_name.py
new file mode 100644
index 0000000000..f210be3631
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_name.py
@@ -0,0 +1,50 @@
+import pyblish.api
+import openpype.api
+
+
+class ValidateTextureBatchNaming(pyblish.api.InstancePlugin):
+    """Validates that all instances had properly formatted name."""
+
+    label = "Validate Texture Batch Naming"
+    hosts = ["standalonepublisher"]
+    order = openpype.api.ValidateContentsOrder
+    families = ["texture_batch_workfile", "textures"]
+    optional = False
+
+    def process(self, instance):
+        file_name = instance.data["representations"][0]["files"]
+        if isinstance(file_name, list):
+            file_name = file_name[0]
+
+        msg = "Couldnt find asset name in '{}'\n".format(file_name) + \
+              "File name doesn't follow configured pattern.\n" + \
+              "Please rename the file."
+        assert "NOT_AVAIL" not in instance.data["asset_build"], msg
+
+        instance.data.pop("asset_build")
+
+        if instance.data["family"] == "textures":
+            file_name = instance.data["representations"][0]["files"][0]
+            self._check_proper_collected(instance.data["versionData"],
+                                         file_name)
+
+    def _check_proper_collected(self, versionData, file_name):
+        """
+            Loop through collected versionData to check if name parsing was OK.
+        Args:
+            versionData: (dict)
+
+        Returns:
+            raises AssertionException
+        """
+        missing_key_values = []
+        for key, value in versionData.items():
+            if not value:
+                missing_key_values.append(key)
+
+        msg = "Collected data {} doesn't contain values for {}".format(
+            versionData, missing_key_values) + "\n" + \
+            "Name of the texture file doesn't match expected pattern.\n" + \
+            "Please rename file(s) {}".format(file_name)
+
+        assert not missing_key_values, msg
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_versions.py b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_versions.py
new file mode 100644
index 0000000000..90d0e8e512
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_versions.py
@@ -0,0 +1,38 @@
+import pyblish.api
+import openpype.api
+
+
+class ValidateTextureBatchVersions(pyblish.api.InstancePlugin):
+    """Validates that versions match in workfile and textures.
+
+        Workfile is optional, so if you are sure, you can disable this
+        validator after Refresh.
+
+        Validates that only single version is published at a time.
+    """
+    label = "Validate Texture Batch Versions"
+    hosts = ["standalonepublisher"]
+    order = openpype.api.ValidateContentsOrder
+    families = ["textures"]
+    optional = False
+
+    def process(self, instance):
+        wfile = instance.data["versionData"].get("workfile")
+
+        version_str = "v{:03d}".format(instance.data["version"])
+
+        if not wfile:  # no matching workfile, do not check versions
+            self.log.info("No workfile present for textures")
+            return
+
+        msg = "Not matching version: texture v{:03d} - workfile {}"
+        assert version_str in wfile, \
+            msg.format(
+                instance.data["version"], wfile
+            )
+
+        present_versions = set()
+        for instance in instance.context:
+            present_versions.add(instance.data["version"])
+
+        assert len(present_versions) == 1, "Too many versions in a batch!"
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_workfiles.py b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_workfiles.py
new file mode 100644
index 0000000000..25bb5aea4a
--- /dev/null
+++ b/openpype/hosts/standalonepublisher/plugins/publish/validate_texture_workfiles.py
@@ -0,0 +1,29 @@
+import pyblish.api
+import openpype.api
+
+
+class ValidateTextureBatchWorkfiles(pyblish.api.InstancePlugin):
+    """Validates that textures workfile has collected resources (optional).
+
+        Collected recourses means secondary workfiles (in most cases).
+    """
+
+    label = "Validate Texture Workfile Has Resources"
+    hosts = ["standalonepublisher"]
+    order = openpype.api.ValidateContentsOrder
+    families = ["texture_batch_workfile"]
+    optional = True
+
+    # from presets
+    main_workfile_extensions = ['mra']
+
+    def process(self, instance):
+        if instance.data["family"] == "workfile":
+            ext = instance.data["representations"][0]["ext"]
+            if ext not in self.main_workfile_extensions:
+                self.log.warning("Only secondary workfile present!")
+                return
+
+            msg = "No secondary workfiles present for workfile {}".\
+                format(instance.data["name"])
+            assert instance.data.get("resources"), msg
diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py b/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py
index d8bb03f541..79cc01740a 100644
--- a/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py
+++ b/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py
@@ -155,6 +155,7 @@ class CollectWorkfileData(pyblish.api.ContextPlugin):
             "sceneMarkInState": mark_in_state == "set",
             "sceneMarkOut": int(mark_out_frame),
             "sceneMarkOutState": mark_out_state == "set",
+            "sceneStartFrame": int(lib.execute_george("tv_startframe")),
             "sceneBgColor": self._get_bg_color()
         }
         self.log.debug(
diff --git a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py
index 536df2adb0..1df7512588 100644
--- a/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py
+++ b/openpype/hosts/tvpaint/plugins/publish/extract_sequence.py
@@ -49,6 +49,14 @@ class ExtractSequence(pyblish.api.Extractor):
         family_lowered = instance.data["family"].lower()
         mark_in = instance.context.data["sceneMarkIn"]
         mark_out = instance.context.data["sceneMarkOut"]
+
+        # Scene start frame offsets the output files, so we need to offset the
+        # marks.
+        scene_start_frame = instance.context.data["sceneStartFrame"]
+        difference = scene_start_frame - mark_in
+        mark_in += difference
+        mark_out += difference
+
         # Frame start/end may be stored as float
         frame_start = int(instance.data["frameStart"])
         frame_end = int(instance.data["frameEnd"])
@@ -98,7 +106,7 @@ class ExtractSequence(pyblish.api.Extractor):
             self.log.warning((
                 "Lowering representation range to {} frames."
                 " Changed frame end {} -> {}"
-            ).format(output_range + 1, mark_out, new_mark_out))
+            ).format(output_range + 1, mark_out, new_output_frame_end))
             output_frame_end = new_output_frame_end
 
         # -------------------------------------------------------------------
diff --git a/openpype/hosts/tvpaint/plugins/publish/increment_workfile_version.py b/openpype/hosts/tvpaint/plugins/publish/increment_workfile_version.py
new file mode 100644
index 0000000000..a96a8e3d5d
--- /dev/null
+++ b/openpype/hosts/tvpaint/plugins/publish/increment_workfile_version.py
@@ -0,0 +1,22 @@
+import pyblish.api
+
+from avalon.tvpaint import workio
+from openpype.api import version_up
+
+
+class IncrementWorkfileVersion(pyblish.api.ContextPlugin):
+    """Increment current workfile version."""
+
+    order = pyblish.api.IntegratorOrder + 1
+    label = "Increment Workfile Version"
+    optional = True
+    hosts = ["tvpaint"]
+
+    def process(self, context):
+
+        assert all(result["success"] for result in context.data["results"]), (
+            "Publishing not succesfull so version is not increased.")
+
+        path = context.data["currentFile"]
+        workio.save_file(version_up(path))
+        self.log.info('Incrementing workfile version')
diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_start_frame.py b/openpype/hosts/tvpaint/plugins/publish/validate_start_frame.py
new file mode 100644
index 0000000000..d769d47736
--- /dev/null
+++ b/openpype/hosts/tvpaint/plugins/publish/validate_start_frame.py
@@ -0,0 +1,27 @@
+import pyblish.api
+from avalon.tvpaint import lib
+
+
+class RepairStartFrame(pyblish.api.Action):
+    """Repair start frame."""
+
+    label = "Repair"
+    icon = "wrench"
+    on = "failed"
+
+    def process(self, context, plugin):
+        lib.execute_george("tv_startframe 0")
+
+
+class ValidateStartFrame(pyblish.api.ContextPlugin):
+    """Validate start frame being at frame 0."""
+
+    label = "Validate Start Frame"
+    order = pyblish.api.ValidatorOrder
+    hosts = ["tvpaint"]
+    actions = [RepairStartFrame]
+    optional = True
+
+    def process(self, context):
+        start_frame = lib.execute_george("tv_startframe")
+        assert int(start_frame) == 0, "Start frame has to be frame 0."
diff --git a/openpype/hosts/unreal/README.md b/openpype/hosts/unreal/README.md
new file mode 100644
index 0000000000..0a69b9e0cf
--- /dev/null
+++ b/openpype/hosts/unreal/README.md
@@ -0,0 +1,9 @@
+## Unreal Integration
+
+Supported Unreal Engine version is 4.26+ (mainly because of major Python changes done there).
+
+### Project naming
+Unreal doesn't support project names starting with non-alphabetic character. So names like `123_myProject` are
+invalid. If OpenPype detects such name it automatically prepends letter **P** to make it valid name, so `123_myProject`
+will become `P123_myProject`. There is also soft-limit on project name length to be shorter than 20 characters.
+Longer names will issue warning in Unreal Editor that there might be possible side effects.
\ No newline at end of file
diff --git a/openpype/hosts/unreal/api/lib.py b/openpype/hosts/unreal/api/lib.py
index 7e706a2789..7e34c3ff15 100644
--- a/openpype/hosts/unreal/api/lib.py
+++ b/openpype/hosts/unreal/api/lib.py
@@ -1,38 +1,51 @@
+# -*- coding: utf-8 -*-
+"""Unreal launching and project tools."""
 import sys
 import os
 import platform
 import json
 from distutils import dir_util
 import subprocess
+import re
+from pathlib import Path
+from collections import OrderedDict
 from openpype.api import get_project_settings
 
 
-def get_engine_versions():
-    """
+def get_engine_versions(env=None):
+    """Detect Unreal Engine versions.
+
     This will try to detect location and versions of installed Unreal Engine.
     Location can be overridden by `UNREAL_ENGINE_LOCATION` environment
     variable.
 
-    Returns:
+    Args:
+        env (dict, optional): Environment to use.
 
-        dict: dictionary with version as a key and dir as value.
+    Returns:
+        OrderedDict: dictionary with version as a key and dir as value.
+            so the highest version is first.
 
     Example:
-
-        >>> get_engine_version()
+        >>> get_engine_versions()
         {
             "4.23": "C:/Epic Games/UE_4.23",
             "4.24": "C:/Epic Games/UE_4.24"
         }
-    """
-    try:
-        engine_locations = {}
-        root, dirs, files = next(os.walk(os.environ["UNREAL_ENGINE_LOCATION"]))
 
-        for dir in dirs:
-            if dir.startswith("UE_"):
-                ver = dir.split("_")[1]
-                engine_locations[ver] = os.path.join(root, dir)
+    """
+    env = env or os.environ
+    engine_locations = {}
+    try:
+        root, dirs, _ = next(os.walk(env["UNREAL_ENGINE_LOCATION"]))
+
+        for directory in dirs:
+            if directory.startswith("UE"):
+                try:
+                    ver = re.split(r"[-_]", directory)[1]
+                except IndexError:
+                    continue
+                engine_locations[ver] = os.path.join(root, directory)
     except KeyError:
         # environment variable not set
         pass
@@ -40,32 +53,52 @@ def get_engine_versions():
         # specified directory doesn't exists
         pass
 
-    # if we've got something, terminate autodetection process
+    # if we've got something, terminate auto-detection process
     if engine_locations:
-        return engine_locations
+        return OrderedDict(sorted(engine_locations.items()))
 
     # else kick in platform specific detection
     if platform.system().lower() == "windows":
-        return _win_get_engine_versions()
-    elif platform.system().lower() == "linux":
+        return OrderedDict(sorted(_win_get_engine_versions().items()))
+    if platform.system().lower() == "linux":
         # on linux, there is no installation and getting Unreal Engine involves
         # git clone. So we'll probably depend on `UNREAL_ENGINE_LOCATION`.
         pass
-    elif platform.system().lower() == "darwin":
-        return _darwin_get_engine_version()
+    if platform.system().lower() == "darwin":
+        return OrderedDict(sorted(_darwin_get_engine_version().items()))
 
-    return {}
+    return OrderedDict()
+
+
+def get_editor_executable_path(engine_path: Path) -> Path:
+    """Get UE4 Editor executable path."""
+    ue4_path = engine_path / "Engine/Binaries"
+    if platform.system().lower() == "windows":
+        ue4_path /= "Win64/UE4Editor.exe"
+
+    elif platform.system().lower() == "linux":
+        ue4_path /= "Linux/UE4Editor"
+
+    elif platform.system().lower() == "darwin":
+        ue4_path /= "Mac/UE4Editor"
+
+    return ue4_path
 
 
 def _win_get_engine_versions():
-    """
+    """Get Unreal Engine versions on Windows.
+
     If engines are installed via Epic Games Launcher then there is:
     `%PROGRAMDATA%/Epic/UnrealEngineLauncher/LauncherInstalled.dat`
     This file is JSON file listing installed stuff, Unreal engines
     are marked with `"AppName" = "UE_X.XX"`` like `UE_4.24`
+
+    Returns:
+        dict: version as a key and path as a value.
+
     """
     install_json_path = os.path.join(
-        os.environ.get("PROGRAMDATA"),
+        os.getenv("PROGRAMDATA"),
         "Epic",
         "UnrealEngineLauncher",
         "LauncherInstalled.dat",
@@ -75,11 +108,19 @@ def _win_get_engine_versions():
 
 
 def _darwin_get_engine_version() -> dict:
-    """
+    """Get Unreal Engine versions on MacOS.
+
     It works the same as on Windows, just JSON file location is different.
+
+    Returns:
+        dict: version as a key and path as a value.
+
+    See Aslo:
+        :func:`_win_get_engine_versions`.
+
     """
     install_json_path = os.path.join(
-        os.environ.get("HOME"),
+        os.getenv("HOME"),
         "Library",
         "Application Support",
         "Epic",
@@ -91,25 +132,26 @@ def _darwin_get_engine_version() -> dict:
 
 
 def _parse_launcher_locations(install_json_path: str) -> dict:
-    """
-    This will parse locations from json file.
+    """This will parse locations from json file.
+
+    Args:
+        install_json_path (str): Path to `LauncherInstalled.dat`.
+
+    Returns:
+        dict: with unreal engine versions as keys and
+            paths to those engine installations as value.
 
-    :param install_json_path: path to `LauncherInstalled.dat`
-    :type install_json_path: str
-    :returns: returns dict with unreal engine versions as keys and
-              paths to those engine installations as value.
-    :rtype: dict
     """
     engine_locations = {}
     if os.path.isfile(install_json_path):
         with open(install_json_path, "r") as ilf:
             try:
                 install_data = json.load(ilf)
-            except json.JSONDecodeError:
+            except json.JSONDecodeError as e:
                 raise Exception(
                     "Invalid `LauncherInstalled.dat file. `"
                     "Cannot determine Unreal Engine location."
-                )
+                ) from e
 
         for installation in install_data.get("InstallationList", []):
             if installation.get("AppName").startswith("UE_"):
@@ -121,55 +163,91 @@ def _parse_launcher_locations(install_json_path: str) -> dict:
 
 def create_unreal_project(project_name: str,
                           ue_version: str,
-                          pr_dir: str,
-                          engine_path: str,
-                          dev_mode: bool = False) -> None:
-    """
-    This will create `.uproject` file at specified location. As there is no
-    way I know to create project via command line, this is easiest option.
-    Unreal project file is basically JSON file. If we find
+                          pr_dir: Path,
+                          engine_path: Path,
+                          dev_mode: bool = False,
+                          env: dict = None) -> None:
+    """This will create `.uproject` file at specified location.
+
+    As there is no way I know to create project via command line, this is
+    easiest option. Unreal project file is basically JSON file. If we find
     `AVALON_UNREAL_PLUGIN` environment variable we assume this is location
     of Avalon Integration Plugin and we copy its content to project folder
     and enable this plugin.
 
-    :param project_name: project name
-    :type project_name: str
-    :param ue_version: unreal engine version (like 4.23)
-    :type ue_version: str
-    :param pr_dir: path to directory where project will be created
-    :type pr_dir: str
-    :param engine_path: Path to Unreal Engine installation
-    :type engine_path: str
-    :param dev_mode: Flag to trigger C++ style Unreal project needing
-                     Visual Studio and other tools to compile plugins from
-                     sources. This will trigger automatically if `Binaries`
-                     directory is not found in plugin folders as this indicates
-                     this is only source distribution of the plugin. Dev mode
-                     is also set by preset file `unreal/project_setup.json` in
-                     **OPENPYPE_CONFIG**.
-    :type dev_mode: bool
-    :returns: None
-    """
-    preset = get_project_settings(project_name)["unreal"]["project_setup"]
+    Args:
+        project_name (str): Name of the project.
+        ue_version (str): Unreal engine version (like 4.23).
+        pr_dir (Path): Path to directory where project will be created.
+        engine_path (Path): Path to Unreal Engine installation.
+        dev_mode (bool, optional): Flag to trigger C++ style Unreal project
+            needing Visual Studio and other tools to compile plugins from
+            sources. This will trigger automatically if `Binaries`
+            directory is not found in plugin folders as this indicates
+            this is only source distribution of the plugin. Dev mode
+            is also set by preset file `unreal/project_setup.json` in
+            **OPENPYPE_CONFIG**.
+        env (dict, optional): Environment to use. If not set, `os.environ`.
 
-    if os.path.isdir(os.environ.get("AVALON_UNREAL_PLUGIN", "")):
+    Throws:
+        NotImplementedError: For unsupported platforms.
+
+    Returns:
+        None
+
+    """
+    env = env or os.environ
+    preset = get_project_settings(project_name)["unreal"]["project_setup"]
+    ue_id = ".".join(ue_version.split(".")[:2])
+    # get unreal engine identifier
+    # -------------------------------------------------------------------------
+    # FIXME (antirotor): As of 4.26 this is problem with UE4 built from
+    # sources. In that case Engine ID is calculated per machine/user and not
+    # from Engine files as this code then reads. This then prevents UE4
+    # to directly open project as it will complain about project being
+    # created in different UE4 version. When user convert such project
+    # to his UE4 version, Engine ID is replaced in uproject file. If some
+    # other user tries to open it, it will present him with similar error.
+    ue4_modules = Path()
+    if platform.system().lower() == "windows":
+        ue4_modules = Path(os.path.join(engine_path, "Engine", "Binaries",
+                                        "Win64", "UE4Editor.modules"))
+
+    if platform.system().lower() == "linux":
+        ue4_modules = Path(os.path.join(engine_path, "Engine", "Binaries",
+                                        "Linux", "UE4Editor.modules"))
+
+    if platform.system().lower() == "darwin":
+        ue4_modules = Path(os.path.join(engine_path, "Engine", "Binaries",
+                                        "Mac", "UE4Editor.modules"))
+
+    if ue4_modules.exists():
+        print("--- Loading Engine ID from modules file ...")
+        with open(ue4_modules, "r") as mp:
+            loaded_modules = json.load(mp)
+
+        if loaded_modules.get("BuildId"):
+            ue_id = "{" + loaded_modules.get("BuildId") + "}"
+
+    plugins_path = None
+    if os.path.isdir(env.get("AVALON_UNREAL_PLUGIN", "")):
         # copy plugin to correct path under project
-        plugins_path = os.path.join(pr_dir, "Plugins")
-        avalon_plugin_path = os.path.join(plugins_path, "Avalon")
-        if not os.path.isdir(avalon_plugin_path):
-            os.makedirs(avalon_plugin_path, exist_ok=True)
+        plugins_path = pr_dir / "Plugins"
+        avalon_plugin_path = plugins_path / "Avalon"
+        if not avalon_plugin_path.is_dir():
+            avalon_plugin_path.mkdir(parents=True, exist_ok=True)
             dir_util._path_created = {}
             dir_util.copy_tree(os.environ.get("AVALON_UNREAL_PLUGIN"),
-                               avalon_plugin_path)
+                               avalon_plugin_path.as_posix())
 
-            if (not os.path.isdir(os.path.join(avalon_plugin_path, "Binaries"))
-                    or not os.path.join(avalon_plugin_path, "Intermediate")):
+            if not (avalon_plugin_path / "Binaries").is_dir() \
+                    or not (avalon_plugin_path / "Intermediate").is_dir():
                 dev_mode = True
 
     # data for project file
     data = {
         "FileVersion": 3,
-        "EngineAssociation": ue_version,
+        "EngineAssociation": ue_id,
         "Category": "",
         "Description": "",
         "Plugins": [
@@ -179,35 +257,6 @@ def create_unreal_project(project_name: str,
         ]
     }
 
-    if preset["install_unreal_python_engine"]:
-        # If `OPENPYPE_UNREAL_ENGINE_PYTHON_PLUGIN` is set, copy it from there
-        # to support offline installation.
-        # Otherwise clone UnrealEnginePython to Plugins directory
-        # https://github.com/20tab/UnrealEnginePython.git
-        uep_path = os.path.join(plugins_path, "UnrealEnginePython")
-        if os.environ.get("OPENPYPE_UNREAL_ENGINE_PYTHON_PLUGIN"):
-
-            os.makedirs(uep_path, exist_ok=True)
-            dir_util._path_created = {}
-            dir_util.copy_tree(
-                os.environ.get("OPENPYPE_UNREAL_ENGINE_PYTHON_PLUGIN"),
-                uep_path)
-        else:
-            # WARNING: this will trigger dev_mode, because we need to compile
-            # this plugin.
-            dev_mode = True
-            import git
-            git.Repo.clone_from(
-                "https://github.com/20tab/UnrealEnginePython.git",
-                uep_path)
-
-        data["Plugins"].append(
-            {"Name": "UnrealEnginePython", "Enabled": True})
-
-        if (not os.path.isdir(os.path.join(uep_path, "Binaries"))
-                or not os.path.join(uep_path, "Intermediate")):
-            dev_mode = True
-
     if dev_mode or preset["dev_mode"]:
         # this will add project module and necessary source file to make it
         # C++ project and to (hopefully) make Unreal Editor to compile all
@@ -220,51 +269,39 @@ def create_unreal_project(project_name: str,
             "AdditionalDependencies": ["Engine"],
         }]
 
-        if preset["install_unreal_python_engine"]:
-            # now we need to fix python path in:
-            # `UnrealEnginePython.Build.cs`
-            # to point to our python
-            with open(os.path.join(
-                    uep_path, "Source",
-                    "UnrealEnginePython",
-                    "UnrealEnginePython.Build.cs"), mode="r") as f:
-                build_file = f.read()
-
-            fix = build_file.replace(
-                'private string pythonHome = "";',
-                'private string pythonHome = "{}";'.format(
-                    sys.base_prefix.replace("\\", "/")))
-
-            with open(os.path.join(
-                    uep_path, "Source",
-                    "UnrealEnginePython",
-                    "UnrealEnginePython.Build.cs"), mode="w") as f:
-                f.write(fix)
-
     # write project file
-    project_file = os.path.join(pr_dir, "{}.uproject".format(project_name))
+    project_file = pr_dir / f"{project_name}.uproject"
     with open(project_file, mode="w") as pf:
         json.dump(data, pf, indent=4)
 
-    # UE < 4.26 have Python2 by default, so we need PySide
-    # but we will not need it in 4.26 and up
-    if int(ue_version.split(".")[1]) < 26:
-        # ensure we have PySide installed in engine
-        # TODO: make it work for other platforms 🍎 🐧
-        if platform.system().lower() == "windows":
-            python_path = os.path.join(engine_path, "Engine", "Binaries",
-                                       "ThirdParty", "Python", "Win64",
-                                       "python.exe")
+    # ensure we have PySide2 installed in engine
+    python_path = None
+    if platform.system().lower() == "windows":
+        python_path = engine_path / ("Engine/Binaries/ThirdParty/"
+                                     "Python3/Win64/pythonw.exe")
 
-            subprocess.run([python_path, "-m",
-                            "pip", "install", "pyside"])
+    if platform.system().lower() == "linux":
+        python_path = engine_path / ("Engine/Binaries/ThirdParty/"
+                                     "Python3/Linux/bin/python3")
+
+    if platform.system().lower() == "darwin":
+        python_path = engine_path / ("Engine/Binaries/ThirdParty/"
+                                     "Python3/Mac/bin/python3")
+
+    if not python_path:
+        raise NotImplementedError("Unsupported platform")
+    if not python_path.exists():
+        raise RuntimeError(f"Unreal Python not found at {python_path}")
+    subprocess.run(
+        [python_path.as_posix(), "-m", "pip", "install", "pyside2"])
 
     if dev_mode or preset["dev_mode"]:
         _prepare_cpp_project(project_file, engine_path)
 
 
-def _prepare_cpp_project(project_file: str, engine_path: str) -> None:
-    """
+def _prepare_cpp_project(project_file: Path, engine_path: Path) -> None:
+    """Prepare CPP Unreal Project.
+
     This function will add source files needed for project to be
     rebuild along with the avalon integration plugin.
 
@@ -273,19 +310,19 @@ def _prepare_cpp_project(project_file: str, engine_path: str) -> None:
     by some generator. This needs more research as manually writing
     those files is rather hackish. :skull_and_crossbones:
 
-    :param project_file: path to .uproject file
-    :type project_file: str
-    :param engine_path: path to unreal engine associated with project
-    :type engine_path: str
+
+    Args:
+        project_file (str): Path to .uproject file.
+        engine_path (str): Path to unreal engine associated with project.
+
     """
+    project_name = project_file.stem
+    project_dir = project_file.parent
+    targets_dir = project_dir / "Source"
+    sources_dir = targets_dir / project_name
 
-    project_name = os.path.splitext(os.path.basename(project_file))[0]
-    project_dir = os.path.dirname(project_file)
-    targets_dir = os.path.join(project_dir, "Source")
-    sources_dir = os.path.join(targets_dir, project_name)
-
-    os.makedirs(sources_dir, exist_ok=True)
-    os.makedirs(os.path.join(project_dir, "Content"), exist_ok=True)
+    sources_dir.mkdir(parents=True, exist_ok=True)
+    (project_dir / "Content").mkdir(parents=True, exist_ok=True)
 
     module_target = '''
 using UnrealBuildTool;
@@ -360,59 +397,59 @@ class {1}_API A{0}GameModeBase : public AGameModeBase
 }};
 '''.format(project_name, project_name.upper())
 
-    with open(os.path.join(
-            targets_dir, f"{project_name}.Target.cs"), mode="w") as f:
+    with open(targets_dir / f"{project_name}.Target.cs", mode="w") as f:
         f.write(module_target)
 
-    with open(os.path.join(
-            targets_dir, f"{project_name}Editor.Target.cs"), mode="w") as f:
+    with open(targets_dir / f"{project_name}Editor.Target.cs", mode="w") as f:
         f.write(editor_module_target)
 
-    with open(os.path.join(
-            sources_dir, f"{project_name}.Build.cs"), mode="w") as f:
+    with open(sources_dir / f"{project_name}.Build.cs", mode="w") as f:
         f.write(module_build)
 
-    with open(os.path.join(
-            sources_dir, f"{project_name}.cpp"), mode="w") as f:
+    with open(sources_dir / f"{project_name}.cpp", mode="w") as f:
         f.write(module_cpp)
 
-    with open(os.path.join(
-            sources_dir, f"{project_name}.h"), mode="w") as f:
+    with open(sources_dir / f"{project_name}.h", mode="w") as f:
         f.write(module_header)
 
-    with open(os.path.join(
-            sources_dir, f"{project_name}GameModeBase.cpp"), mode="w") as f:
+    with open(sources_dir / f"{project_name}GameModeBase.cpp", mode="w") as f:
         f.write(game_mode_cpp)
 
-    with open(os.path.join(
-            sources_dir, f"{project_name}GameModeBase.h"), mode="w") as f:
+    with open(sources_dir / f"{project_name}GameModeBase.h", mode="w") as f:
         f.write(game_mode_h)
 
+    u_build_tool = Path(
+        engine_path / "Engine/Binaries/DotNET/UnrealBuildTool.exe")
+    u_header_tool = None
+
+    arch = "Win64"
     if platform.system().lower() == "windows":
-        u_build_tool = (f"{engine_path}/Engine/Binaries/DotNET/"
-                        "UnrealBuildTool.exe")
-        u_header_tool = (f"{engine_path}/Engine/Binaries/Win64/"
-                         f"UnrealHeaderTool.exe")
+        arch = "Win64"
+        u_header_tool = Path(
+            engine_path / "Engine/Binaries/Win64/UnrealHeaderTool.exe")
     elif platform.system().lower() == "linux":
-        # WARNING: there is no UnrealBuildTool on linux?
-        u_build_tool = ""
-        u_header_tool = ""
+        arch = "Linux"
+        u_header_tool = Path(
+            engine_path / "Engine/Binaries/Linux/UnrealHeaderTool")
     elif platform.system().lower() == "darwin":
-        # WARNING: there is no UnrealBuildTool on Mac?
-        u_build_tool = ""
-        u_header_tool = ""
+        # we need to test this out
+        arch = "Mac"
+        u_header_tool = Path(
+            engine_path / "Engine/Binaries/Mac/UnrealHeaderTool")
 
-    u_build_tool = u_build_tool.replace("\\", "/")
-    u_header_tool = u_header_tool.replace("\\", "/")
+    if not u_header_tool:
+        raise NotImplementedError("Unsupported platform")
 
-    command1 = [u_build_tool, "-projectfiles", f"-project={project_file}",
-                "-progress"]
+    command1 = [u_build_tool.as_posix(), "-projectfiles",
+                f"-project={project_file}", "-progress"]
 
     subprocess.run(command1)
 
-    command2 = [u_build_tool, f"-ModuleWithSuffix={project_name},3555"
-                "Win64", "Development", "-TargetType=Editor"
-                f'-Project="{project_file}"', f'"{project_file}"'
+    command2 = [u_build_tool.as_posix(),
+                f"-ModuleWithSuffix={project_name},3555", arch,
+                "Development", "-TargetType=Editor",
+                f'-Project={project_file}',
+                f'{project_file}',
                 "-IgnoreJunk"]
 
     subprocess.run(command2)
diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py
index f084cccfc3..01b8b6bc05 100644
--- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py
+++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py
@@ -1,31 +1,49 @@
+# -*- coding: utf-8 -*-
+"""Hook to launch Unreal and prepare projects."""
 import os
+from pathlib import Path
 
 from openpype.lib import (
     PreLaunchHook,
-    ApplicationLaunchFailed
+    ApplicationLaunchFailed,
+    ApplicationNotFound
 )
 from openpype.hosts.unreal.api import lib as unreal_lib
 
 
 class UnrealPrelaunchHook(PreLaunchHook):
-    """
+    """Hook to handle launching Unreal.
+
     This hook will check if current workfile path has Unreal
     project inside. IF not, it initialize it and finally it pass
     path to the project by environment variable to Unreal launcher
     shell script.
-    """
 
+    """
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.signature = "( {} )".format(self.__class__.__name__)
 
     def execute(self):
+        """Hook entry method."""
         asset_name = self.data["asset_name"]
         task_name = self.data["task_name"]
         workdir = self.launch_context.env["AVALON_WORKDIR"]
         engine_version = self.app_name.split("/")[-1].replace("-", ".")
         unreal_project_name = f"{asset_name}_{task_name}"
+        try:
+            if int(engine_version.split(".")[0]) < 4 and \
+                    int(engine_version.split(".")[1]) < 26:
+                raise ApplicationLaunchFailed((
+                    f"{self.signature} Old unsupported version of UE4 "
+                    f"detected - {engine_version}"))
+        except ValueError:
+            # there can be string in minor version and in that case
+            # int cast is failing. This probably happens only with
+            # early access versions and is of no concert for this check
+            # so lets keep it quite.
+            ...
 
         # Unreal is sensitive about project names longer then 20 chars
         if len(unreal_project_name) > 20:
@@ -45,19 +63,21 @@ class UnrealPrelaunchHook(PreLaunchHook):
             ))
             unreal_project_name = f"P{unreal_project_name}"
 
-        project_path = os.path.join(workdir, unreal_project_name)
+        project_path = Path(os.path.join(workdir, unreal_project_name))
 
         self.log.info((
             f"{self.signature} requested UE4 version: "
             f"[ {engine_version} ]"
         ))
 
-        detected = unreal_lib.get_engine_versions()
+        detected = unreal_lib.get_engine_versions(self.launch_context.env)
         detected_str = ', '.join(detected.keys()) or 'none'
         self.log.info((
             f"{self.signature} detected UE4 versions: "
             f"[ {detected_str} ]"
         ))
+        if not detected:
+            raise ApplicationNotFound("No Unreal Engines are found.")
 
         engine_version = ".".join(engine_version.split(".")[:2])
         if engine_version not in detected.keys():
@@ -66,13 +86,14 @@ class UnrealPrelaunchHook(PreLaunchHook):
                 f"detected [ {engine_version} ]"
             ))
 
-        os.makedirs(project_path, exist_ok=True)
+        ue4_path = unreal_lib.get_editor_executable_path(
+            Path(detected[engine_version]))
 
-        project_file = os.path.join(
-            project_path,
-            f"{unreal_project_name}.uproject"
-        )
-        if not os.path.isfile(project_file):
+        self.launch_context.launch_args.append(ue4_path.as_posix())
+        project_path.mkdir(parents=True, exist_ok=True)
+
+        project_file = project_path / f"{unreal_project_name}.uproject"
+        if not project_file.is_file():
             engine_path = detected[engine_version]
             self.log.info((
                 f"{self.signature} creating unreal "
@@ -88,8 +109,9 @@ class UnrealPrelaunchHook(PreLaunchHook):
                 unreal_project_name,
                 engine_version,
                 project_path,
-                engine_path=engine_path
+                engine_path=Path(engine_path)
             )
 
         # Append project file to launch arguments
-        self.launch_context.launch_args.append(f"\"{project_file}\"")
+        self.launch_context.launch_args.append(
+            f"\"{project_file.as_posix()}\"")
diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index 1eac7ea776..fe964d3bab 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -1,4 +1,5 @@
 import os
+import sys
 import re
 import copy
 import json
@@ -449,6 +450,12 @@ class ApplicationExecutable:
     """Representation of executable loaded from settings."""
 
     def __init__(self, executable):
+        # Try to format executable with environments
+        try:
+            executable = executable.format(**os.environ)
+        except Exception:
+            pass
+
         # On MacOS check if exists path to executable when ends with `.app`
         # - it is common that path will lead to "/Applications/Blender" but
         #   real path is "/Applications/Blender.app"
@@ -460,12 +467,6 @@ class ApplicationExecutable:
             if os.path.exists(_executable):
                 executable = _executable
 
-        # Try to format executable with environments
-        try:
-            executable = executable.format(**os.environ)
-        except Exception:
-            pass
-
         self.executable_path = executable
 
     def __str__(self):
@@ -708,6 +709,10 @@ class ApplicationLaunchContext:
             )
             self.kwargs["creationflags"] = flags
 
+        if not sys.stdout:
+            self.kwargs["stdout"] = subprocess.DEVNULL
+            self.kwargs["stderr"] = subprocess.DEVNULL
+
         self.prelaunch_hooks = None
         self.postlaunch_hooks = None
 
@@ -1133,7 +1138,8 @@ def prepare_host_environments(data, implementation_envs=True):
         # Merge dictionaries
         env_values = _merge_env(tool_env, env_values)
 
-    loaded_env = _merge_env(acre.compute(env_values), data["env"])
+    merged_env = _merge_env(env_values, data["env"])
+    loaded_env = acre.compute(merged_env, cleanup=False)
 
     final_env = None
     # Add host specific environments
@@ -1184,7 +1190,10 @@ def apply_project_environments_value(project_name, env, project_settings=None):
 
     env_value = project_settings["global"]["project_environments"]
     if env_value:
-        env.update(_merge_env(acre.parse(env_value), env))
+        env.update(acre.compute(
+            _merge_env(acre.parse(env_value), env),
+            cleanup=False
+        ))
     return env
 
 
@@ -1297,10 +1306,18 @@ def _prepare_last_workfile(data, workdir):
     )
     data["start_last_workfile"] = start_last_workfile
 
+    workfile_startup = should_workfile_tool_start(
+        project_name, app.host_name, task_name
+    )
+    data["workfile_startup"] = workfile_startup
+
     # Store boolean as "0"(False) or "1"(True)
     data["env"]["AVALON_OPEN_LAST_WORKFILE"] = (
         str(int(bool(start_last_workfile)))
     )
+    data["env"]["OPENPYPE_WORKFILE_TOOL_ON_START"] = (
+        str(int(bool(workfile_startup)))
+    )
 
     _sub_msg = "" if start_last_workfile else " not"
     log.debug(
@@ -1339,40 +1356,9 @@ def _prepare_last_workfile(data, workdir):
     data["last_workfile_path"] = last_workfile_path
 
 
-def should_start_last_workfile(
-    project_name, host_name, task_name, default_output=False
+def get_option_from_settings(
+    startup_presets, host_name, task_name, default_output
 ):
-    """Define if host should start last version workfile if possible.
-
-    Default output is `False`. Can be overriden with environment variable
-    `AVALON_OPEN_LAST_WORKFILE`, valid values without case sensitivity are
-    `"0", "1", "true", "false", "yes", "no"`.
-
-    Args:
-        project_name (str): Name of project.
-        host_name (str): Name of host which is launched. In avalon's
-            application context it's value stored in app definition under
-            key `"application_dir"`. Is not case sensitive.
-        task_name (str): Name of task which is used for launching the host.
-            Task name is not case sensitive.
-
-    Returns:
-        bool: True if host should start workfile.
-
-    """
-
-    project_settings = get_project_settings(project_name)
-    startup_presets = (
-        project_settings
-        ["global"]
-        ["tools"]
-        ["Workfiles"]
-        ["last_workfile_on_startup"]
-    )
-
-    if not startup_presets:
-        return default_output
-
     host_name_lowered = host_name.lower()
     task_name_lowered = task_name.lower()
 
@@ -1416,6 +1402,82 @@ def should_start_last_workfile(
     return default_output
 
 
+def should_start_last_workfile(
+    project_name, host_name, task_name, default_output=False
+):
+    """Define if host should start last version workfile if possible.
+
+    Default output is `False`. Can be overriden with environment variable
+    `AVALON_OPEN_LAST_WORKFILE`, valid values without case sensitivity are
+    `"0", "1", "true", "false", "yes", "no"`.
+
+    Args:
+        project_name (str): Name of project.
+        host_name (str): Name of host which is launched. In avalon's
+            application context it's value stored in app definition under
+            key `"application_dir"`. Is not case sensitive.
+        task_name (str): Name of task which is used for launching the host.
+            Task name is not case sensitive.
+
+    Returns:
+        bool: True if host should start workfile.
+
+    """
+
+    project_settings = get_project_settings(project_name)
+    startup_presets = (
+        project_settings
+        ["global"]
+        ["tools"]
+        ["Workfiles"]
+        ["last_workfile_on_startup"]
+    )
+
+    if not startup_presets:
+        return default_output
+
+    return get_option_from_settings(
+        startup_presets, host_name, task_name, default_output)
+
+
+def should_workfile_tool_start(
+    project_name, host_name, task_name, default_output=False
+):
+    """Define if host should start workfile tool at host launch.
+
+    Default output is `False`. Can be overriden with environment variable
+    `OPENPYPE_WORKFILE_TOOL_ON_START`, valid values without case sensitivity are
+    `"0", "1", "true", "false", "yes", "no"`.
+
+    Args:
+        project_name (str): Name of project.
+        host_name (str): Name of host which is launched. In avalon's
+            application context it's value stored in app definition under
+            key `"application_dir"`. Is not case sensitive.
+        task_name (str): Name of task which is used for launching the host.
+            Task name is not case sensitive.
+
+    Returns:
+        bool: True if host should start workfile.
+
+    """
+
+    project_settings = get_project_settings(project_name)
+    startup_presets = (
+        project_settings
+        ["global"]
+        ["tools"]
+        ["Workfiles"]
+        ["open_workfile_tool_on_startup"]
+    )
+
+    if not startup_presets:
+        return default_output
+
+    return get_option_from_settings(
+        startup_presets, host_name, task_name, default_output)
+
+
 def compile_list_of_regexes(in_list):
     """Convert strings in entered list to compiled regex objects."""
     regexes = list()
diff --git a/openpype/lib/editorial.py b/openpype/lib/editorial.py
index 158488dd56..8e8e365bdb 100644
--- a/openpype/lib/editorial.py
+++ b/openpype/lib/editorial.py
@@ -7,6 +7,8 @@ try:
     import opentimelineio as otio
     from opentimelineio import opentime as _ot
 except ImportError:
+    if not os.environ.get("AVALON_APP"):
+        raise
     otio = discover_host_vendor_module("opentimelineio")
     _ot = discover_host_vendor_module("opentimelineio.opentime")
 
diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index a5841f406c..6b52e4b387 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -199,7 +199,7 @@ def get_renderer_variables(renderlayer, root):
         if extension is None:
             extension = "png"
 
-        if extension == "exr (multichannel)" or extension == "exr (deep)":
+        if extension in ["exr (multichannel)", "exr (deep)"]:
             extension = "exr"
 
         prefix_attr = "vraySettings.fileNamePrefix"
@@ -271,6 +271,22 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
             ["DEADLINE_REST_URL"]
         )
 
+        self._job_info = (
+            context.data["project_settings"].get(
+                "deadline", {}).get(
+                "publish", {}).get(
+                "MayaSubmitDeadline", {}).get(
+                "jobInfo", {})
+        )
+
+        self._plugin_info = (
+            context.data["project_settings"].get(
+                "deadline", {}).get(
+                "publish", {}).get(
+                "MayaSubmitDeadline", {}).get(
+                "pluginInfo", {})
+        )
+
         assert self._deadline_url, "Requires DEADLINE_REST_URL"
 
         context = instance.context
@@ -279,57 +295,70 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         instance.data["toBeRenderedOn"] = "deadline"
 
         filepath = None
+        patches = (
+            context.data["project_settings"].get(
+                "deadline", {}).get(
+                "publish", {}).get(
+                "MayaSubmitDeadline", {}).get(
+                "scene_patches", {})
+        )
 
         # Handle render/export from published scene or not ------------------
         if self.use_published:
+            patched_files = []
             for i in context:
-                if "workfile" in i.data["families"]:
-                    assert i.data["publish"] is True, (
-                        "Workfile (scene) must be published along")
-                    template_data = i.data.get("anatomyData")
-                    rep = i.data.get("representations")[0].get("name")
-                    template_data["representation"] = rep
-                    template_data["ext"] = rep
-                    template_data["comment"] = None
-                    anatomy_filled = anatomy.format(template_data)
-                    template_filled = anatomy_filled["publish"]["path"]
-                    filepath = os.path.normpath(template_filled)
-                    self.log.info("Using published scene for render {}".format(
-                        filepath))
+                if "workfile" not in i.data["families"]:
+                    continue
+                assert i.data["publish"] is True, (
+                    "Workfile (scene) must be published along")
+                template_data = i.data.get("anatomyData")
+                rep = i.data.get("representations")[0].get("name")
+                template_data["representation"] = rep
+                template_data["ext"] = rep
+                template_data["comment"] = None
+                anatomy_filled = anatomy.format(template_data)
+                template_filled = anatomy_filled["publish"]["path"]
+                filepath = os.path.normpath(template_filled)
+                self.log.info("Using published scene for render {}".format(
+                    filepath))
 
-                    if not os.path.exists(filepath):
-                        self.log.error("published scene does not exist!")
-                        raise
-                    # now we need to switch scene in expected files
-                    # because <scene> token will now point to published
-                    # scene file and that might differ from current one
-                    new_scene = os.path.splitext(
-                        os.path.basename(filepath))[0]
-                    orig_scene = os.path.splitext(
-                        os.path.basename(context.data["currentFile"]))[0]
-                    exp = instance.data.get("expectedFiles")
+                if not os.path.exists(filepath):
+                    self.log.error("published scene does not exist!")
+                    raise
+                # now we need to switch scene in expected files
+                # because <scene> token will now point to published
+                # scene file and that might differ from current one
+                new_scene = os.path.splitext(
+                    os.path.basename(filepath))[0]
+                orig_scene = os.path.splitext(
+                    os.path.basename(context.data["currentFile"]))[0]
+                exp = instance.data.get("expectedFiles")
 
-                    if isinstance(exp[0], dict):
-                        # we have aovs and we need to iterate over them
-                        new_exp = {}
-                        for aov, files in exp[0].items():
-                            replaced_files = []
-                            for f in files:
-                                replaced_files.append(
-                                    f.replace(orig_scene, new_scene)
-                                )
-                            new_exp[aov] = replaced_files
-                        instance.data["expectedFiles"] = [new_exp]
-                    else:
-                        new_exp = []
-                        for f in exp:
-                            new_exp.append(
+                if isinstance(exp[0], dict):
+                    # we have aovs and we need to iterate over them
+                    new_exp = {}
+                    for aov, files in exp[0].items():
+                        replaced_files = []
+                        for f in files:
+                            replaced_files.append(
                                 f.replace(orig_scene, new_scene)
                             )
-                        instance.data["expectedFiles"] = [new_exp]
-                    self.log.info("Scene name was switched {} -> {}".format(
-                        orig_scene, new_scene
-                    ))
+                        new_exp[aov] = replaced_files
+                    instance.data["expectedFiles"] = [new_exp]
+                else:
+                    new_exp = []
+                    for f in exp:
+                        new_exp.append(
+                            f.replace(orig_scene, new_scene)
+                        )
+                    instance.data["expectedFiles"] = [new_exp]
+                self.log.info("Scene name was switched {} -> {}".format(
+                    orig_scene, new_scene
+                ))
+                # patch workfile is needed
+                if filepath not in patched_files:
+                    patched_file = self._patch_workfile(filepath, patches)
+                    patched_files.append(patched_file)
 
         all_instances = []
         for result in context.data["results"]:
@@ -407,7 +436,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         self.payload_skeleton["JobInfo"]["Priority"] = \
             self._instance.data.get("priority", 50)
 
-        if self.group != "none":
+        if self.group != "none" and self.group:
             self.payload_skeleton["JobInfo"]["Group"] = self.group
 
         if self.limit_groups:
@@ -536,6 +565,10 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
 
         self.preflight_check(instance)
 
+        # add jobInfo and pluginInfo variables from Settings
+        payload["JobInfo"].update(self._job_info)
+        payload["PluginInfo"].update(self._plugin_info)
+
         # Prepare tiles data ------------------------------------------------
         if instance.data.get("tileRendering"):
             # if we have sequence of files, we need to create tile job for
@@ -848,10 +881,11 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         payload["JobInfo"].update(job_info_ext)
         payload["PluginInfo"].update(plugin_info_ext)
 
-        envs = []
-        for k, v in payload["JobInfo"].items():
-            if k.startswith("EnvironmentKeyValue"):
-                envs.append(v)
+        envs = [
+            v
+            for k, v in payload["JobInfo"].items()
+            if k.startswith("EnvironmentKeyValue")
+        ]
 
         # add app name to environment
         envs.append(
@@ -872,11 +906,8 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         envs.append(
             "OPENPYPE_ASS_EXPORT_STEP={}".format(1))
 
-        i = 0
-        for e in envs:
+        for i, e in enumerate(envs):
             payload["JobInfo"]["EnvironmentKeyValue{}".format(i)] = e
-            i += 1
-
         return payload
 
     def _get_vray_render_payload(self, data):
@@ -983,7 +1014,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
 
         """
         if 'verify' not in kwargs:
-            kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True  # noqa
+            kwargs['verify'] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
         # add 10sec timeout before bailing out
         kwargs['timeout'] = 10
         return requests.post(*args, **kwargs)
@@ -1002,7 +1033,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
 
         """
         if 'verify' not in kwargs:
-            kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True  # noqa
+            kwargs['verify'] = not os.getenv("OPENPYPE_DONT_VERIFY_SSL", True)
         # add 10sec timeout before bailing out
         kwargs['timeout'] = 10
         return requests.get(*args, **kwargs)
@@ -1049,3 +1080,43 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         result = filename_zero.replace("\\", "/")
 
         return result
+
+    def _patch_workfile(self, file, patches):
+        # type: (str, dict) -> [str, None]
+        """Patch Maya scene.
+
+        This will take list of patches (lines to add) and apply them to
+        *published* Maya  scene file (that is used later for rendering).
+
+        Patches are dict with following structure::
+            {
+                "name": "Name of patch",
+                "regex": "regex of line before patch",
+                "line": "line to insert"
+            }
+
+        Args:
+            file (str): File to patch.
+            patches (dict): Dictionary defining patches.
+
+        Returns:
+            str: Patched file path or None
+
+        """
+        if os.path.splitext(file)[1].lower() != ".ma" or not patches:
+            return None
+
+        compiled_regex = [re.compile(p["regex"]) for p in patches]
+        with open(file, "r+") as pf:
+            scene_data = pf.readlines()
+            for ln, line in enumerate(scene_data):
+                for i, r in enumerate(compiled_regex):
+                    if re.match(r, line):
+                        scene_data.insert(ln + 1, patches[i]["line"])
+                        pf.seek(0)
+                        pf.writelines(scene_data)
+                        pf.truncate()
+                        self.log.info(
+                            "Applied {} patch to scene.".format(
+                                patches[i]["name"]))
+        return file
diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
index 7faa3393e5..fed98d8a08 100644
--- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -32,6 +32,8 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin):
     department = ""
     limit_groups = {}
     use_gpu = False
+    env_allowed_keys = []
+    env_search_replace_values = {}
 
     def process(self, instance):
         instance.data["toBeRenderedOn"] = "deadline"
@@ -242,19 +244,19 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin):
             "PYBLISHPLUGINPATH",
             "NUKE_PATH",
             "TOOL_ENV",
-            "OPENPYPE_DEV",
             "FOUNDRY_LICENSE"
         ]
+        # add allowed keys from preset if any
+        if self.env_allowed_keys:
+            keys += self.env_allowed_keys
+
         environment = dict({key: os.environ[key] for key in keys
                             if key in os.environ}, **api.Session)
         # self.log.debug("enviro: {}".format(pprint(environment)))
-        for path in os.environ:
-            if path.lower().startswith('pype_'):
-                environment[path] = os.environ[path]
-            if path.lower().startswith('nuke_'):
-                environment[path] = os.environ[path]
-            if 'license' in path.lower():
-                environment[path] = os.environ[path]
+
+        for _path in os.environ:
+            if _path.lower().startswith('openpype_'):
+                environment[_path] = os.environ[_path]
 
         clean_environment = {}
         for key, value in environment.items():
@@ -285,6 +287,13 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin):
         environment = clean_environment
         # to recognize job from PYPE for turning Event On/Off
         environment["OPENPYPE_RENDER_JOB"] = "1"
+
+        # finally search replace in values of any key
+        if self.env_search_replace_values:
+            for key, value in environment.items():
+                for _k, _v in self.env_search_replace_values.items():
+                    environment[key] = value.replace(_k, _v)
+
         payload["JobInfo"].update({
             "EnvironmentKeyValue%d" % index: "{key}={value}".format(
                 key=key,
diff --git a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index c71b5106ec..305c71b035 100644
--- a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -181,6 +181,10 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
         """Returns set of file names from metadata.json"""
         expected_files = set()
 
-        for file_name in repre["files"]:
+        files = repre["files"]
+        if not isinstance(files, list):
+            files = [files]
+
+        for file_name in files:
             expected_files.add(file_name)
         return expected_files
diff --git a/openpype/modules/ftrack/event_handlers_server/action_clone_review_session.py b/openpype/modules/ftrack/event_handlers_server/action_clone_review_session.py
index d29316c795..59c8bffb75 100644
--- a/openpype/modules/ftrack/event_handlers_server/action_clone_review_session.py
+++ b/openpype/modules/ftrack/event_handlers_server/action_clone_review_session.py
@@ -16,11 +16,13 @@ def clone_review_session(session, entity):
 
     # Add all invitees.
     for invitee in entity["review_session_invitees"]:
+        # Make sure email is not None but string
+        email = invitee["email"] or ""
         session.create(
             "ReviewSessionInvitee",
             {
                 "name": invitee["name"],
-                "email": invitee["email"],
+                "email": email,
                 "review_session": review_session
             }
         )
diff --git a/openpype/modules/ftrack/event_handlers_server/action_multiple_notes.py b/openpype/modules/ftrack/event_handlers_server/action_multiple_notes.py
new file mode 100644
index 0000000000..9ad7b1a969
--- /dev/null
+++ b/openpype/modules/ftrack/event_handlers_server/action_multiple_notes.py
@@ -0,0 +1,167 @@
+from openpype.modules.ftrack.lib import ServerAction
+
+
+class MultipleNotesServer(ServerAction):
+    """Action adds same note for muliple AssetVersions.
+
+    Note is added to selection of AssetVersions. Note is created with user
+    who triggered the action. It is possible to define note category of note.
+    """
+
+    identifier = "multiple.notes.server"
+    label = "Multiple Notes (Server)"
+    description = "Add same note to multiple Asset Versions"
+
+    _none_category = "__NONE__"
+
+    def discover(self, session, entities, event):
+        """Show action only on AssetVersions."""
+        if not entities:
+            return False
+
+        for entity in entities:
+            if entity.entity_type.lower() != "assetversion":
+                return False
+        return True
+
+    def interface(self, session, entities, event):
+        event_source = event["source"]
+        user_info = event_source.get("user") or {}
+        user_id = user_info.get("id")
+        if not user_id:
+            return None
+
+        values = event["data"].get("values")
+        if values:
+            return None
+
+        note_label = {
+            "type": "label",
+            "value": "# Enter note: #"
+        }
+
+        note_value = {
+            "name": "note",
+            "type": "textarea"
+        }
+
+        category_label = {
+            "type": "label",
+            "value": "## Category: ##"
+        }
+
+        category_data = []
+        category_data.append({
+            "label": "- None -",
+            "value": self._none_category
+        })
+        all_categories = session.query(
+            "select id, name from NoteCategory"
+        ).all()
+        for cat in all_categories:
+            category_data.append({
+                "label": cat["name"],
+                "value": cat["id"]
+            })
+        category_value = {
+            "type": "enumerator",
+            "name": "category",
+            "data": category_data,
+            "value": self._none_category
+        }
+
+        splitter = {
+            "type": "label",
+            "value": "---"
+        }
+
+        return [
+            note_label,
+            note_value,
+            splitter,
+            category_label,
+            category_value
+        ]
+
+    def launch(self, session, entities, event):
+        if "values" not in event["data"]:
+            return None
+
+        values = event["data"]["values"]
+        if len(values) <= 0 or "note" not in values:
+            return False
+
+        # Get Note text
+        note_value = values["note"]
+        if note_value.lower().strip() == "":
+            return {
+                "success": True,
+                "message": "Note was not entered. Skipping"
+            }
+
+        # Get User
+        event_source = event["source"]
+        user_info = event_source.get("user") or {}
+        user_id = user_info.get("id")
+        user = None
+        if user_id:
+            user = session.query(
+                'User where id is "{}"'.format(user_id)
+            ).first()
+
+        if not user:
+            return {
+                "success": False,
+                "message": "Couldn't get user information."
+            }
+
+        # Logging message preparation
+        # - username
+        username = user.get("username") or "N/A"
+
+        # - AssetVersion ids
+        asset_version_ids_str = ",".join([entity["id"] for entity in entities])
+
+        # Base note data
+        note_data = {
+            "content": note_value,
+            "author": user
+        }
+
+        # Get category
+        category_id = values["category"]
+        if category_id == self._none_category:
+            category_id = None
+
+        category_name = None
+        if category_id is not None:
+            category = session.query(
+                "select id, name from NoteCategory where id is \"{}\"".format(
+                    category_id
+                )
+            ).first()
+            if category:
+                note_data["category"] = category
+                category_name = category["name"]
+
+        category_msg = ""
+        if category_name:
+            category_msg = " with category: \"{}\"".format(category_name)
+
+        self.log.warning((
+            "Creating note{} as User \"{}\" on "
+            "AssetVersions: {} with value \"{}\""
+        ).format(category_msg, username, asset_version_ids_str, note_value))
+
+        # Create notes for entities
+        for entity in entities:
+            new_note = session.create("Note", note_data)
+            entity["notes"].append(new_note)
+            session.commit()
+        return True
+
+
+def register(session):
+    '''Register plugin. Called when used as an plugin.'''
+
+    MultipleNotesServer(session).register()
diff --git a/openpype/modules/ftrack/event_handlers_server/action_prepare_project.py b/openpype/modules/ftrack/event_handlers_server/action_prepare_project.py
index 12d687bbf2..3a96ae3311 100644
--- a/openpype/modules/ftrack/event_handlers_server/action_prepare_project.py
+++ b/openpype/modules/ftrack/event_handlers_server/action_prepare_project.py
@@ -1,6 +1,8 @@
 import json
 
+from avalon.api import AvalonMongoDB
 from openpype.api import ProjectSettings
+from openpype.lib import create_project
 
 from openpype.modules.ftrack.lib import (
     ServerAction,
@@ -21,8 +23,24 @@ class PrepareProjectServer(ServerAction):
 
     role_list = ["Pypeclub", "Administrator", "Project Manager"]
 
-    # Key to store info about trigerring create folder structure
+    settings_key = "prepare_project"
+
     item_splitter = {"type": "label", "value": "---"}
+    _keys_order = (
+        "fps",
+        "frameStart",
+        "frameEnd",
+        "handleStart",
+        "handleEnd",
+        "clipIn",
+        "clipOut",
+        "resolutionHeight",
+        "resolutionWidth",
+        "pixelAspect",
+        "applications",
+        "tools_env",
+        "library_project",
+    )
 
     def discover(self, session, entities, event):
         """Show only on project."""
@@ -47,13 +65,7 @@ class PrepareProjectServer(ServerAction):
         project_entity = entities[0]
         project_name = project_entity["full_name"]
 
-        try:
-            project_settings = ProjectSettings(project_name)
-        except ValueError:
-            return {
-                "message": "Project is not synchronized yet",
-                "success": False
-            }
+        project_settings = ProjectSettings(project_name)
 
         project_anatom_settings = project_settings["project_anatomy"]
         root_items = self.prepare_root_items(project_anatom_settings)
@@ -78,14 +90,13 @@ class PrepareProjectServer(ServerAction):
 
         items.extend(ca_items)
 
-        # This item will be last (before enumerators)
-        # - sets value of auto synchronization
-        auto_sync_name = "avalon_auto_sync"
+        # This item will be last before enumerators
+        # Set value of auto synchronization
         auto_sync_value = project_entity["custom_attributes"].get(
             CUST_ATTR_AUTO_SYNC, False
         )
         auto_sync_item = {
-            "name": auto_sync_name,
+            "name": CUST_ATTR_AUTO_SYNC,
             "type": "boolean",
             "value": auto_sync_value,
             "label": "AutoSync to Avalon"
@@ -199,7 +210,18 @@ class PrepareProjectServer(ServerAction):
             str([key for key in attributes_to_set])
         ))
 
-        for key, in_data in attributes_to_set.items():
+        attribute_keys = set(attributes_to_set.keys())
+        keys_order = []
+        for key in self._keys_order:
+            if key in attribute_keys:
+                keys_order.append(key)
+
+        attribute_keys = attribute_keys - set(keys_order)
+        for key in sorted(attribute_keys):
+            keys_order.append(key)
+
+        for key in keys_order:
+            in_data = attributes_to_set[key]
             attr = in_data["object"]
 
             # initial item definition
@@ -225,7 +247,7 @@ class PrepareProjectServer(ServerAction):
                     multiselect_enumerators.append(self.item_splitter)
                     multiselect_enumerators.append({
                         "type": "label",
-                        "value": in_data["label"]
+                        "value": "<h3>{}</h3>".format(in_data["label"])
                     })
 
                     default = in_data["default"]
@@ -286,10 +308,10 @@ class PrepareProjectServer(ServerAction):
         return items, multiselect_enumerators
 
     def launch(self, session, entities, event):
-        if not event['data'].get('values', {}):
+        in_data = event["data"].get("values")
+        if not in_data:
             return
 
-        in_data = event['data']['values']
 
         root_values = {}
         root_key = "__root__"
@@ -337,7 +359,27 @@ class PrepareProjectServer(ServerAction):
 
         self.log.debug("Setting Custom Attribute values")
 
-        project_name = entities[0]["full_name"]
+        project_entity = entities[0]
+        project_name = project_entity["full_name"]
+
+        # Try to find project document
+        dbcon = AvalonMongoDB()
+        dbcon.install()
+        dbcon.Session["AVALON_PROJECT"] = project_name
+        project_doc = dbcon.find_one({
+            "type": "project"
+        })
+        # Create project if is not available
+        # - creation is required to be able set project anatomy and attributes
+        if not project_doc:
+            project_code = project_entity["name"]
+            self.log.info("Creating project \"{} [{}]\"".format(
+                project_name, project_code
+            ))
+            create_project(project_name, project_code, dbcon=dbcon)
+
+        dbcon.uninstall()
+
         project_settings = ProjectSettings(project_name)
         project_anatomy_settings = project_settings["project_anatomy"]
         project_anatomy_settings["roots"] = root_data
@@ -352,10 +394,12 @@ class PrepareProjectServer(ServerAction):
 
         project_settings.save()
 
-        entity = entities[0]
-        for key, value in custom_attribute_values.items():
-            entity["custom_attributes"][key] = value
-            self.log.debug("- Key \"{}\" set to \"{}\"".format(key, value))
+        # Change custom attributes on project
+        if custom_attribute_values:
+            for key, value in custom_attribute_values.items():
+                project_entity["custom_attributes"][key] = value
+                self.log.debug("- Key \"{}\" set to \"{}\"".format(key, value))
+            session.commit()
 
         return True
 
diff --git a/openpype/modules/ftrack/event_handlers_server/action_private_project_detection.py b/openpype/modules/ftrack/event_handlers_server/action_private_project_detection.py
new file mode 100644
index 0000000000..5213e10ba3
--- /dev/null
+++ b/openpype/modules/ftrack/event_handlers_server/action_private_project_detection.py
@@ -0,0 +1,61 @@
+from openpype.modules.ftrack.lib import ServerAction
+
+
+class PrivateProjectDetectionAction(ServerAction):
+    """Action helps to identify if does not have access to project."""
+
+    identifier = "server.missing.perm.private.project"
+    label = "Missing permissions"
+    description = (
+        "Main ftrack event server does not have access to this project."
+    )
+
+    def _discover(self, event):
+        """Show action only if there is a selection in event data."""
+        entities = self._translate_event(event)
+        if entities:
+            return None
+
+        selection = event["data"].get("selection")
+        if not selection:
+            return None
+
+        return {
+            "items": [{
+                "label": self.label,
+                "variant": self.variant,
+                "description": self.description,
+                "actionIdentifier": self.discover_identifier,
+                "icon": self.icon,
+            }]
+        }
+
+    def _launch(self, event):
+        # Ignore if there are values in event data
+        # - somebody clicked on submit button
+        values = event["data"].get("values")
+        if values:
+            return None
+
+        title = "# Private project (missing permissions) #"
+        msg = (
+            "User ({}) or API Key used on Ftrack event server"
+            " does not have permissions to access this private project."
+        ).format(self.session.api_user)
+        return {
+            "type": "form",
+            "title": "Missing permissions",
+            "items": [
+                {"type": "label", "value": title},
+                {"type": "label", "value": msg},
+                # Add hidden to be able detect if was clicked on submit
+                {"type": "hidden", "value": "1", "name": "hidden"}
+            ],
+            "submit_button_label": "Got it"
+        }
+
+
+def register(session):
+    '''Register plugin. Called when used as an plugin.'''
+
+    PrivateProjectDetectionAction(session).register()
diff --git a/openpype/modules/ftrack/event_handlers_server/action_push_frame_values_to_task.py b/openpype/modules/ftrack/event_handlers_server/action_push_frame_values_to_task.py
index 214f1ecf18..b38e18d089 100644
--- a/openpype/modules/ftrack/event_handlers_server/action_push_frame_values_to_task.py
+++ b/openpype/modules/ftrack/event_handlers_server/action_push_frame_values_to_task.py
@@ -1,3 +1,4 @@
+import sys
 import json
 import collections
 import ftrack_api
@@ -90,27 +91,28 @@ class PushHierValuesToNonHier(ServerAction):
 
         try:
             result = self.propagate_values(session, event, entities)
-            job["status"] = "done"
-            session.commit()
-
-            return result
-
-        except Exception:
-            session.rollback()
-            job["status"] = "failed"
-            session.commit()
 
+        except Exception as exc:
             msg = "Pushing Custom attribute values to task Failed"
+
             self.log.warning(msg, exc_info=True)
+
+            session.rollback()
+
+            description = "{} (Download traceback)".format(msg)
+            self.add_traceback_to_job(
+                job, session, sys.exc_info(), description
+            )
+
             return {
                 "success": False,
-                "message": msg
+                "message": "Error: {}".format(str(exc))
             }
 
-        finally:
-            if job["status"] == "running":
-                job["status"] = "failed"
-                session.commit()
+        job["status"] = "done"
+        session.commit()
+
+        return result
 
     def attrs_configurations(self, session, object_ids, interest_attributes):
         attrs = session.query(self.cust_attrs_query.format(
diff --git a/openpype/modules/ftrack/event_handlers_server/event_sync_to_avalon.py b/openpype/modules/ftrack/event_handlers_server/event_sync_to_avalon.py
index e60045bd50..1dd056adee 100644
--- a/openpype/modules/ftrack/event_handlers_server/event_sync_to_avalon.py
+++ b/openpype/modules/ftrack/event_handlers_server/event_sync_to_avalon.py
@@ -1259,7 +1259,7 @@ class SyncToAvalonEvent(BaseEvent):
             self.process_session,
             entity,
             hier_attrs,
-            self.cust_attr_types_by_id
+            self.cust_attr_types_by_id.values()
         )
         for key, val in hier_values.items():
             output[key] = val
diff --git a/openpype/modules/ftrack/event_handlers_user/action_applications.py b/openpype/modules/ftrack/event_handlers_user/action_applications.py
index 23c96e1b9f..74d14c2fc4 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_applications.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_applications.py
@@ -11,29 +11,44 @@ from avalon.api import AvalonMongoDB
 
 
 class AppplicationsAction(BaseAction):
-    """Application Action class.
-
-    Args:
-        session (ftrack_api.Session): Session where action will be registered.
-        label (str): A descriptive string identifing your action.
-        varaint (str, optional): To group actions together, give them the same
-            label and specify a unique variant per action.
-        identifier (str): An unique identifier for app.
-        description (str): A verbose descriptive text for you action.
-        icon (str): Url path to icon which will be shown in Ftrack web.
-    """
+    """Applications Action class."""
 
     type = "Application"
     label = "Application action"
-    identifier = "pype_app.{}.".format(str(uuid4()))
+
+    identifier = "openpype_app"
+    _launch_identifier_with_id = None
+
     icon_url = os.environ.get("OPENPYPE_STATICS_SERVER")
 
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        super(AppplicationsAction, self).__init__(*args, **kwargs)
 
         self.application_manager = ApplicationManager()
         self.dbcon = AvalonMongoDB()
 
+    @property
+    def discover_identifier(self):
+        if self._discover_identifier is None:
+            self._discover_identifier = "{}.{}".format(
+                self.identifier, self.process_identifier()
+            )
+        return self._discover_identifier
+
+    @property
+    def launch_identifier(self):
+        if self._launch_identifier is None:
+            self._launch_identifier = "{}.*".format(self.identifier)
+        return self._launch_identifier
+
+    @property
+    def launch_identifier_with_id(self):
+        if self._launch_identifier_with_id is None:
+            self._launch_identifier_with_id = "{}.{}".format(
+                self.identifier, self.process_identifier()
+            )
+        return self._launch_identifier_with_id
+
     def construct_requirements_validations(self):
         # Override validation as this action does not need them
         return
@@ -56,7 +71,7 @@ class AppplicationsAction(BaseAction):
             " and data.actionIdentifier={0}"
             " and source.user.username={1}"
         ).format(
-            self.identifier + "*",
+            self.launch_identifier,
             self.session.api_user
         )
         self.session.event_hub.subscribe(
@@ -136,12 +151,29 @@ class AppplicationsAction(BaseAction):
                 "label": app.group.label,
                 "variant": app.label,
                 "description": None,
-                "actionIdentifier": self.identifier + app_name,
+                "actionIdentifier": "{}.{}".format(
+                    self.launch_identifier_with_id, app_name
+                ),
                 "icon": app_icon
             })
 
         return items
 
+    def _launch(self, event):
+        event_identifier = event["data"]["actionIdentifier"]
+        # Check if identifier is same
+        # - show message that acion may not be triggered on this machine
+        if event_identifier.startswith(self.launch_identifier_with_id):
+            return BaseAction._launch(self, event)
+
+        return {
+            "success": False,
+            "message": (
+                "There are running more OpenPype processes"
+                " where Application can be launched."
+            )
+        }
+
     def launch(self, session, entities, event):
         """Callback method for the custom action.
 
@@ -162,7 +194,8 @@ class AppplicationsAction(BaseAction):
         *event* the unmodified original event
         """
         identifier = event["data"]["actionIdentifier"]
-        app_name = identifier[len(self.identifier):]
+        id_identifier_len = len(self.launch_identifier_with_id) + 1
+        app_name = identifier[id_identifier_len:]
 
         entity = entities[0]
 
diff --git a/openpype/modules/ftrack/event_handlers_user/action_create_project_structure.py b/openpype/modules/ftrack/event_handlers_user/action_create_project_structure.py
index d7ac866e42..035a1c60de 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_create_project_structure.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_create_project_structure.py
@@ -1,5 +1,6 @@
 import os
 import re
+import json
 
 from openpype.modules.ftrack.lib import BaseAction, statics_icon
 from openpype.api import Anatomy, get_project_settings
@@ -84,6 +85,9 @@ class CreateProjectFolders(BaseAction):
             }
 
         try:
+            if isinstance(project_folder_structure, str):
+                project_folder_structure = json.loads(project_folder_structure)
+
             # Get paths based on presets
             basic_paths = self.get_path_items(project_folder_structure)
             self.create_folders(basic_paths, project_entity)
diff --git a/openpype/modules/ftrack/event_handlers_user/action_multiple_notes.py b/openpype/modules/ftrack/event_handlers_user/action_multiple_notes.py
index 8db65fe39b..f5af044de0 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_multiple_notes.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_multiple_notes.py
@@ -9,16 +9,24 @@ class MultipleNotes(BaseAction):
     #: Action label.
     label = 'Multiple Notes'
     #: Action description.
-    description = 'Add same note to multiple Asset Versions'
+    description = 'Add same note to multiple entities'
     icon = statics_icon("ftrack", "action_icons", "MultipleNotes.svg")
 
     def discover(self, session, entities, event):
         ''' Validation '''
         valid = True
+
+        # Check for multiple selection.
+        if len(entities) < 2:
+            valid = False
+
+        # Check for valid entities.
+        valid_entity_types = ['assetversion', 'task']
         for entity in entities:
-            if entity.entity_type.lower() != 'assetversion':
+            if entity.entity_type.lower() not in valid_entity_types:
                 valid = False
                 break
+
         return valid
 
     def interface(self, session, entities, event):
@@ -58,7 +66,7 @@ class MultipleNotes(BaseAction):
 
             splitter = {
                 'type': 'label',
-                'value': '{}'.format(200*"-")
+                'value': '{}'.format(200 * "-")
             }
 
             items = []
diff --git a/openpype/modules/ftrack/event_handlers_user/action_prepare_project.py b/openpype/modules/ftrack/event_handlers_user/action_prepare_project.py
index 5298c06371..4b42500e8f 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_prepare_project.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_prepare_project.py
@@ -1,6 +1,8 @@
 import json
 
+from avalon.api import AvalonMongoDB
 from openpype.api import ProjectSettings
+from openpype.lib import create_project
 
 from openpype.modules.ftrack.lib import (
     BaseAction,
@@ -23,7 +25,24 @@ class PrepareProjectLocal(BaseAction):
     settings_key = "prepare_project"
 
     # Key to store info about trigerring create folder structure
+    create_project_structure_key = "create_folder_structure"
+    create_project_structure_identifier = "create.project.structure"
     item_splitter = {"type": "label", "value": "---"}
+    _keys_order = (
+        "fps",
+        "frameStart",
+        "frameEnd",
+        "handleStart",
+        "handleEnd",
+        "clipIn",
+        "clipOut",
+        "resolutionHeight",
+        "resolutionWidth",
+        "pixelAspect",
+        "applications",
+        "tools_env",
+        "library_project",
+    )
 
     def discover(self, session, entities, event):
         """Show only on project."""
@@ -48,13 +67,7 @@ class PrepareProjectLocal(BaseAction):
         project_entity = entities[0]
         project_name = project_entity["full_name"]
 
-        try:
-            project_settings = ProjectSettings(project_name)
-        except ValueError:
-            return {
-                "message": "Project is not synchronized yet",
-                "success": False
-            }
+        project_settings = ProjectSettings(project_name)
 
         project_anatom_settings = project_settings["project_anatomy"]
         root_items = self.prepare_root_items(project_anatom_settings)
@@ -79,14 +92,12 @@ class PrepareProjectLocal(BaseAction):
 
         items.extend(ca_items)
 
-        # This item will be last (before enumerators)
-        # - sets value of auto synchronization
-        auto_sync_name = "avalon_auto_sync"
+        # Set value of auto synchronization
         auto_sync_value = project_entity["custom_attributes"].get(
             CUST_ATTR_AUTO_SYNC, False
         )
         auto_sync_item = {
-            "name": auto_sync_name,
+            "name": CUST_ATTR_AUTO_SYNC,
             "type": "boolean",
             "value": auto_sync_value,
             "label": "AutoSync to Avalon"
@@ -94,6 +105,27 @@ class PrepareProjectLocal(BaseAction):
         # Add autosync attribute
         items.append(auto_sync_item)
 
+        # This item will be last before enumerators
+        # Ask if want to trigger Action Create Folder Structure
+        create_project_structure_checked = (
+            project_settings
+            ["project_settings"]
+            ["ftrack"]
+            ["user_handlers"]
+            ["prepare_project"]
+            ["create_project_structure_checked"]
+        ).value
+        items.append({
+            "type": "label",
+            "value": "<h3>Want to create basic Folder Structure?</h3>"
+        })
+        items.append({
+            "name": self.create_project_structure_key,
+            "type": "boolean",
+            "value": create_project_structure_checked,
+            "label": "Check if Yes"
+        })
+
         # Add enumerator items at the end
         for item in multiselect_enumerators:
             items.append(item)
@@ -200,7 +232,18 @@ class PrepareProjectLocal(BaseAction):
             str([key for key in attributes_to_set])
         ))
 
-        for key, in_data in attributes_to_set.items():
+        attribute_keys = set(attributes_to_set.keys())
+        keys_order = []
+        for key in self._keys_order:
+            if key in attribute_keys:
+                keys_order.append(key)
+
+        attribute_keys = attribute_keys - set(keys_order)
+        for key in sorted(attribute_keys):
+            keys_order.append(key)
+
+        for key in keys_order:
+            in_data = attributes_to_set[key]
             attr = in_data["object"]
 
             # initial item definition
@@ -226,7 +269,7 @@ class PrepareProjectLocal(BaseAction):
                     multiselect_enumerators.append(self.item_splitter)
                     multiselect_enumerators.append({
                         "type": "label",
-                        "value": in_data["label"]
+                        "value": "<h3>{}</h3>".format(in_data["label"])
                     })
 
                     default = in_data["default"]
@@ -287,10 +330,13 @@ class PrepareProjectLocal(BaseAction):
         return items, multiselect_enumerators
 
     def launch(self, session, entities, event):
-        if not event['data'].get('values', {}):
+        in_data = event["data"].get("values")
+        if not in_data:
             return
 
-        in_data = event['data']['values']
+        create_project_structure_checked = in_data.pop(
+            self.create_project_structure_key
+        )
 
         root_values = {}
         root_key = "__root__"
@@ -338,7 +384,27 @@ class PrepareProjectLocal(BaseAction):
 
         self.log.debug("Setting Custom Attribute values")
 
-        project_name = entities[0]["full_name"]
+        project_entity = entities[0]
+        project_name = project_entity["full_name"]
+
+        # Try to find project document
+        dbcon = AvalonMongoDB()
+        dbcon.install()
+        dbcon.Session["AVALON_PROJECT"] = project_name
+        project_doc = dbcon.find_one({
+            "type": "project"
+        })
+        # Create project if is not available
+        # - creation is required to be able set project anatomy and attributes
+        if not project_doc:
+            project_code = project_entity["name"]
+            self.log.info("Creating project \"{} [{}]\"".format(
+                project_name, project_code
+            ))
+            create_project(project_name, project_code, dbcon=dbcon)
+
+        dbcon.uninstall()
+
         project_settings = ProjectSettings(project_name)
         project_anatomy_settings = project_settings["project_anatomy"]
         project_anatomy_settings["roots"] = root_data
@@ -353,11 +419,20 @@ class PrepareProjectLocal(BaseAction):
 
         project_settings.save()
 
-        entity = entities[0]
-        for key, value in custom_attribute_values.items():
-            entity["custom_attributes"][key] = value
-            self.log.debug("- Key \"{}\" set to \"{}\"".format(key, value))
+        # Change custom attributes on project
+        if custom_attribute_values:
+            for key, value in custom_attribute_values.items():
+                project_entity["custom_attributes"][key] = value
+                self.log.debug("- Key \"{}\" set to \"{}\"".format(key, value))
+            session.commit()
 
+        # Trigger create project structure action
+        if create_project_structure_checked:
+            trigger_identifier = "{}.{}".format(
+                self.create_project_structure_identifier,
+                self.process_identifier()
+            )
+            self.trigger_action(trigger_identifier, event)
         return True
 
 
diff --git a/openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py b/openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py
index 6950d45ecd..2c427cfff7 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_where_run_ask.py
@@ -1,33 +1,98 @@
+import platform
+import socket
+import getpass
+
 from openpype.modules.ftrack.lib import BaseAction, statics_icon
 
 
-class ActionAskWhereIRun(BaseAction):
-    """ Sometimes user forget where pipeline with his credentials is running.
-    - this action triggers `ActionShowWhereIRun`
-    """
-    ignore_me = True
-    identifier = 'ask.where.i.run'
-    label = 'Ask where I run'
-    description = 'Triggers PC info where user have running OpenPype'
-    icon = statics_icon("ftrack", "action_icons", "ActionAskWhereIRun.svg")
+class ActionWhereIRun(BaseAction):
+    """Show where same user has running OpenPype instances."""
 
-    def discover(self, session, entities, event):
-        """ Hide by default - Should be enabled only if you want to run.
-        - best practise is to create another action that triggers this one
-        """
+    identifier = "ask.where.i.run"
+    show_identifier = "show.where.i.run"
+    label = "OpenPype Admin"
+    variant = "- Where I run"
+    description = "Show PC info where user have running OpenPype"
 
-        return True
+    def _discover(self, _event):
+        return {
+            "items": [{
+                "label": self.label,
+                "variant": self.variant,
+                "description": self.description,
+                "actionIdentifier": self.discover_identifier,
+                "icon": self.icon,
+            }]
+        }
 
-    def launch(self, session, entities, event):
-        more_data = {"event_hub_id": session.event_hub.id}
-        self.trigger_action(
-            "show.where.i.run", event, additional_event_data=more_data
+    def _launch(self, event):
+        self.trigger_action(self.show_identifier, event)
+
+    def register(self):
+        # Register default action callbacks
+        super(ActionWhereIRun, self).register()
+
+        # Add show identifier
+        show_subscription = (
+            "topic=ftrack.action.launch"
+            " and data.actionIdentifier={}"
+            " and source.user.username={}"
+        ).format(
+            self.show_identifier,
+            self.session.api_user
+        )
+        self.session.event_hub.subscribe(
+            show_subscription,
+            self._show_info
         )
 
-        return True
+    def _show_info(self, event):
+        title = "Where Do I Run?"
+        msgs = {}
+        all_keys = ["Hostname", "IP", "Username", "System name", "PC name"]
+        try:
+            host_name = socket.gethostname()
+            msgs["Hostname"] = host_name
+            host_ip = socket.gethostbyname(host_name)
+            msgs["IP"] = host_ip
+        except Exception:
+            pass
+
+        try:
+            system_name, pc_name, *_ = platform.uname()
+            msgs["System name"] = system_name
+            msgs["PC name"] = pc_name
+        except Exception:
+            pass
+
+        try:
+            msgs["Username"] = getpass.getuser()
+        except Exception:
+            pass
+
+        for key in all_keys:
+            if not msgs.get(key):
+                msgs[key] = "-Undefined-"
+
+        items = []
+        first = True
+        separator = {"type": "label", "value": "---"}
+        for key, value in msgs.items():
+            if first:
+                first = False
+            else:
+                items.append(separator)
+            self.log.debug("{}: {}".format(key, value))
+
+            subtitle = {"type": "label", "value": "<h3>{}</h3>".format(key)}
+            items.append(subtitle)
+            message = {"type": "label", "value": "<p>{}</p>".format(value)}
+            items.append(message)
+
+        self.show_interface(items, title, event=event)
 
 
 def register(session):
     '''Register plugin. Called when used as an plugin.'''
 
-    ActionAskWhereIRun(session).register()
+    ActionWhereIRun(session).register()
diff --git a/openpype/modules/ftrack/event_handlers_user/action_where_run_show.py b/openpype/modules/ftrack/event_handlers_user/action_where_run_show.py
deleted file mode 100644
index 4ce1a439a3..0000000000
--- a/openpype/modules/ftrack/event_handlers_user/action_where_run_show.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import platform
-import socket
-import getpass
-from openpype.modules.ftrack.lib import BaseAction
-
-
-class ActionShowWhereIRun(BaseAction):
-    """ Sometimes user forget where pipeline with his credentials is running.
-    - this action shows on which PC, Username and IP is running
-    - requirement action MUST be registered where we want to locate the PC:
-    - - can't be used retrospectively...
-    """
-    #: Action identifier.
-    identifier = 'show.where.i.run'
-    #: Action label.
-    label = 'Show where I run'
-    #: Action description.
-    description = 'Shows PC info where user have running OpenPype'
-
-    def discover(self, session, entities, event):
-        """ Hide by default - Should be enabled only if you want to run.
-        - best practise is to create another action that triggers this one
-        """
-
-        return False
-
-    def launch(self, session, entities, event):
-        # Don't show info when was launch from this session
-        if session.event_hub.id == event.get("data", {}).get("event_hub_id"):
-            return True
-
-        title = "Where Do I Run?"
-        msgs = {}
-        all_keys = ["Hostname", "IP", "Username", "System name", "PC name"]
-        try:
-            host_name = socket.gethostname()
-            msgs["Hostname"] = host_name
-            host_ip = socket.gethostbyname(host_name)
-            msgs["IP"] = host_ip
-        except Exception:
-            pass
-
-        try:
-            system_name, pc_name, *_ = platform.uname()
-            msgs["System name"] = system_name
-            msgs["PC name"] = pc_name
-        except Exception:
-            pass
-
-        try:
-            msgs["Username"] = getpass.getuser()
-        except Exception:
-            pass
-
-        for key in all_keys:
-            if not msgs.get(key):
-                msgs[key] = "-Undefined-"
-
-        items = []
-        first = True
-        splitter = {'type': 'label', 'value': '---'}
-        for key, value in msgs.items():
-            if first:
-                first = False
-            else:
-                items.append(splitter)
-            self.log.debug("{}: {}".format(key, value))
-
-            subtitle = {'type': 'label', 'value': '<h3>{}</h3>'.format(key)}
-            items.append(subtitle)
-            message = {'type': 'label', 'value': '<p>{}</p>'.format(value)}
-            items.append(message)
-
-        self.show_interface(items, title, event=event)
-
-        return True
-
-
-def register(session):
-    '''Register plugin. Called when used as an plugin.'''
-
-    ActionShowWhereIRun(session).register()
diff --git a/openpype/modules/ftrack/lib/ftrack_action_handler.py b/openpype/modules/ftrack/lib/ftrack_action_handler.py
index 2bff9d8cb3..b24fe5f12a 100644
--- a/openpype/modules/ftrack/lib/ftrack_action_handler.py
+++ b/openpype/modules/ftrack/lib/ftrack_action_handler.py
@@ -29,6 +29,9 @@ class BaseAction(BaseHandler):
     icon = None
     type = 'Action'
 
+    _discover_identifier = None
+    _launch_identifier = None
+
     settings_frack_subkey = "user_handlers"
     settings_enabled_key = "enabled"
 
@@ -42,6 +45,22 @@ class BaseAction(BaseHandler):
 
         super().__init__(session)
 
+    @property
+    def discover_identifier(self):
+        if self._discover_identifier is None:
+            self._discover_identifier = "{}.{}".format(
+                self.identifier, self.process_identifier()
+            )
+        return self._discover_identifier
+
+    @property
+    def launch_identifier(self):
+        if self._launch_identifier is None:
+            self._launch_identifier = "{}.{}".format(
+                self.identifier, self.process_identifier()
+            )
+        return self._launch_identifier
+
     def register(self):
         '''
         Registers the action, subscribing the the discover and launch topics.
@@ -60,7 +79,7 @@ class BaseAction(BaseHandler):
             ' and data.actionIdentifier={0}'
             ' and source.user.username={1}'
         ).format(
-            self.identifier,
+            self.launch_identifier,
             self.session.api_user
         )
         self.session.event_hub.subscribe(
@@ -86,7 +105,7 @@ class BaseAction(BaseHandler):
                 'label': self.label,
                 'variant': self.variant,
                 'description': self.description,
-                'actionIdentifier': self.identifier,
+                'actionIdentifier': self.discover_identifier,
                 'icon': self.icon,
             }]
         }
@@ -309,6 +328,78 @@ class BaseAction(BaseHandler):
         return True
 
 
+class LocalAction(BaseAction):
+    """Action that warn user when more Processes with same action are running.
+
+    Action is launched all the time but if id does not match id of current
+    instanace then message is shown to user.
+
+    Handy for actions where matters if is executed on specific machine.
+    """
+    _full_launch_identifier = None
+
+    @property
+    def discover_identifier(self):
+        if self._discover_identifier is None:
+            self._discover_identifier = "{}.{}".format(
+                self.identifier, self.process_identifier()
+            )
+        return self._discover_identifier
+
+    @property
+    def launch_identifier(self):
+        """Catch all topics with same identifier."""
+        if self._launch_identifier is None:
+            self._launch_identifier = "{}.*".format(self.identifier)
+        return self._launch_identifier
+
+    @property
+    def full_launch_identifier(self):
+        """Catch all topics with same identifier."""
+        if self._full_launch_identifier is None:
+            self._full_launch_identifier = "{}.{}".format(
+                self.identifier, self.process_identifier()
+            )
+        return self._full_launch_identifier
+
+    def _discover(self, event):
+        entities = self._translate_event(event)
+        if not entities:
+            return
+
+        accepts = self.discover(self.session, entities, event)
+        if not accepts:
+            return
+
+        self.log.debug("Discovering action with selection: {0}".format(
+            event["data"].get("selection", [])
+        ))
+
+        return {
+            "items": [{
+                "label": self.label,
+                "variant": self.variant,
+                "description": self.description,
+                "actionIdentifier": self.discover_identifier,
+                "icon": self.icon,
+            }]
+        }
+
+    def _launch(self, event):
+        event_identifier = event["data"]["actionIdentifier"]
+        # Check if identifier is same
+        # - show message that acion may not be triggered on this machine
+        if event_identifier != self.full_launch_identifier:
+            return {
+                "success": False,
+                "message": (
+                    "There are running more OpenPype processes"
+                    " where this action could be launched."
+                )
+            }
+        return super(LocalAction, self)._launch(event)
+
+
 class ServerAction(BaseAction):
     """Action class meant to be used on event server.
 
@@ -318,6 +409,14 @@ class ServerAction(BaseAction):
 
     settings_frack_subkey = "events"
 
+    @property
+    def discover_identifier(self):
+        return self.identifier
+
+    @property
+    def launch_identifier(self):
+        return self.identifier
+
     def register(self):
         """Register subcription to Ftrack event hub."""
         self.session.event_hub.subscribe(
@@ -328,5 +427,5 @@ class ServerAction(BaseAction):
 
         launch_subscription = (
             "topic=ftrack.action.launch and data.actionIdentifier={0}"
-        ).format(self.identifier)
+        ).format(self.launch_identifier)
         self.session.event_hub.subscribe(launch_subscription, self._launch)
diff --git a/openpype/modules/ftrack/lib/ftrack_base_handler.py b/openpype/modules/ftrack/lib/ftrack_base_handler.py
index 817841df4a..7b7ebfb099 100644
--- a/openpype/modules/ftrack/lib/ftrack_base_handler.py
+++ b/openpype/modules/ftrack/lib/ftrack_base_handler.py
@@ -1,4 +1,10 @@
+import os
+import tempfile
+import json
 import functools
+import uuid
+import datetime
+import traceback
 import time
 from openpype.api import Logger
 from openpype.settings import get_project_settings
@@ -31,6 +37,7 @@ class BaseHandler(object):
     <description>   - a verbose descriptive text for you action
     <icon>  - icon in ftrack
     '''
+    _process_id = None
     # Default priority is 100
     priority = 100
     # Type is just for logging purpose (e.g.: Action, Event, Application,...)
@@ -65,6 +72,13 @@ class BaseHandler(object):
         self.register = self.register_decorator(self.register)
         self.launch = self.launch_log(self.launch)
 
+    @staticmethod
+    def process_identifier():
+        """Helper property to have """
+        if not BaseHandler._process_id:
+            BaseHandler._process_id = str(uuid.uuid4())
+        return BaseHandler._process_id
+
     # Decorator
     def register_decorator(self, func):
         @functools.wraps(func)
@@ -177,15 +191,22 @@ class BaseHandler(object):
         if session is None:
             session = self.session
 
-        _entities = event['data'].get('entities_object', None)
+        _entities = event["data"].get("entities_object", None)
+        if _entities is not None and not _entities:
+            return _entities
+
         if (
-            _entities is None or
-            _entities[0].get(
-                'link', None
+            _entities is None
+            or _entities[0].get(
+                "link", None
             ) == ftrack_api.symbol.NOT_SET
         ):
-            _entities = self._get_entities(event)
-            event['data']['entities_object'] = _entities
+            _entities = [
+                item
+                for item in self._get_entities(event)
+                if item is not None
+            ]
+            event["data"]["entities_object"] = _entities
 
         return _entities
 
@@ -583,3 +604,105 @@ class BaseHandler(object):
         return "/".join(
             [ent["name"] for ent in entity["link"]]
         )
+
+    @classmethod
+    def add_traceback_to_job(
+        cls, job, session, exc_info,
+        description=None,
+        component_name=None,
+        job_status=None
+    ):
+        """Add traceback file to a job.
+
+        Args:
+            job (JobEntity): Entity of job where file should be able to
+                download (Created or queried with passed session).
+            session (Session): Ftrack session which was used to query/create
+                entered job.
+            exc_info (tuple): Exception info (e.g. from `sys.exc_info()`).
+            description (str): Change job description to describe what
+                happened. Job description won't change if not passed.
+            component_name (str): Name of component and default name of
+                downloaded file. Class name and current date time are used if
+                not specified.
+            job_status (str): Status of job which will be set. By default is
+                set to 'failed'.
+        """
+        if description:
+            job_data = {
+                "description": description
+            }
+            job["data"] = json.dumps(job_data)
+
+        if not job_status:
+            job_status = "failed"
+
+        job["status"] = job_status
+
+        # Create temp file where traceback will be stored
+        temp_obj = tempfile.NamedTemporaryFile(
+            mode="w", prefix="openpype_ftrack_", suffix=".txt", delete=False
+        )
+        temp_obj.close()
+        temp_filepath = temp_obj.name
+
+        # Store traceback to file
+        result = traceback.format_exception(*exc_info)
+        with open(temp_filepath, "w") as temp_file:
+            temp_file.write("".join(result))
+
+        # Upload file with traceback to ftrack server and add it to job
+        if not component_name:
+            component_name = "{}_{}".format(
+                cls.__name__,
+                datetime.datetime.now().strftime("%y-%m-%d-%H%M")
+            )
+        cls.add_file_component_to_job(
+            job, session, temp_filepath, component_name
+        )
+        # Delete temp file
+        os.remove(temp_filepath)
+
+    @staticmethod
+    def add_file_component_to_job(job, session, filepath, basename=None):
+        """Add filepath as downloadable component to job.
+
+        Args:
+            job (JobEntity): Entity of job where file should be able to
+                download (Created or queried with passed session).
+            session (Session): Ftrack session which was used to query/create
+                entered job.
+            filepath (str): Path to file which should be added to job.
+            basename (str): Defines name of file which will be downloaded on
+                user's side. Must be without extension otherwise extension will
+                be duplicated in downloaded name. Basename from entered path
+                used when not entered.
+        """
+        # Make sure session's locations are configured
+        # - they can be deconfigured e.g. using `rollback` method
+        session._configure_locations()
+
+        # Query `ftrack.server` location where component will be stored
+        location = session.query(
+            "Location where name is \"ftrack.server\""
+        ).one()
+
+        # Use filename as basename if not entered (must be without extension)
+        if basename is None:
+            basename = os.path.splitext(
+                os.path.basename(filepath)
+            )[0]
+
+        component = session.create_component(
+            filepath,
+            data={"name": basename},
+            location=location
+        )
+        session.create(
+            "JobComponent",
+            {
+                "component_id": component["id"],
+                "job_id": job["id"]
+            }
+        )
+        session.commit()
diff --git a/openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py b/openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py
index b505a429b5..8464a43ef7 100644
--- a/openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py
+++ b/openpype/modules/ftrack/plugins/publish/collect_ftrack_family.py
@@ -51,7 +51,7 @@ class CollectFtrackFamily(pyblish.api.InstancePlugin):
             families = instance.data.get("families")
             add_ftrack_family = profile["add_ftrack_family"]
 
-            additional_filters = profile.get("additional_filters")
+            additional_filters = profile.get("advanced_filtering")
             if additional_filters:
                 add_ftrack_family = self._get_add_ftrack_f_from_addit_filters(
                     additional_filters,
diff --git a/openpype/modules/log_viewer/tray/app.py b/openpype/modules/log_viewer/tray/app.py
index 9aab37cd20..1e8d6483cd 100644
--- a/openpype/modules/log_viewer/tray/app.py
+++ b/openpype/modules/log_viewer/tray/app.py
@@ -7,12 +7,13 @@ class LogsWindow(QtWidgets.QWidget):
     def __init__(self, parent=None):
         super(LogsWindow, self).__init__(parent)
 
-        self.setStyleSheet(style.load_stylesheet())
+        self.setWindowTitle("Logs viewer")
+
         self.resize(1400, 800)
         log_detail = OutputWidget(parent=self)
         logs_widget = LogsWidget(log_detail, parent=self)
 
-        main_layout = QtWidgets.QHBoxLayout()
+        main_layout = QtWidgets.QHBoxLayout(self)
 
         log_splitter = QtWidgets.QSplitter(self)
         log_splitter.setOrientation(QtCore.Qt.Horizontal)
@@ -24,5 +25,4 @@ class LogsWindow(QtWidgets.QWidget):
         self.logs_widget = logs_widget
         self.log_detail = log_detail
 
-        self.setLayout(main_layout)
-        self.setWindowTitle("Logs")
+        self.setStyleSheet(style.load_stylesheet())
diff --git a/openpype/modules/log_viewer/tray/widgets.py b/openpype/modules/log_viewer/tray/widgets.py
index b9a8499a4c..5a67780413 100644
--- a/openpype/modules/log_viewer/tray/widgets.py
+++ b/openpype/modules/log_viewer/tray/widgets.py
@@ -77,12 +77,10 @@ class CustomCombo(QtWidgets.QWidget):
         toolbutton.setMenu(toolmenu)
         toolbutton.setPopupMode(QtWidgets.QToolButton.MenuButtonPopup)
 
-        layout = QtWidgets.QHBoxLayout()
+        layout = QtWidgets.QHBoxLayout(self)
         layout.setContentsMargins(0, 0, 0, 0)
         layout.addWidget(toolbutton)
 
-        self.setLayout(layout)
-
         toolmenu.selection_changed.connect(self.selection_changed)
 
         self.toolbutton = toolbutton
@@ -141,7 +139,6 @@ class LogsWidget(QtWidgets.QWidget):
         filter_layout.addWidget(refresh_btn)
 
         view = QtWidgets.QTreeView(self)
-        view.setAllColumnsShowFocus(True)
         view.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
 
         layout = QtWidgets.QVBoxLayout(self)
@@ -229,9 +226,9 @@ class OutputWidget(QtWidgets.QWidget):
         super(OutputWidget, self).__init__(parent=parent)
         layout = QtWidgets.QVBoxLayout(self)
 
-        show_timecode_checkbox = QtWidgets.QCheckBox("Show timestamp")
+        show_timecode_checkbox = QtWidgets.QCheckBox("Show timestamp", self)
 
-        output_text = QtWidgets.QTextEdit()
+        output_text = QtWidgets.QTextEdit(self)
         output_text.setReadOnly(True)
         # output_text.setLineWrapMode(QtWidgets.QTextEdit.FixedPixelWidth)
 
diff --git a/openpype/modules/timers_manager/rest_api.py b/openpype/modules/timers_manager/rest_api.py
index 975c1a91f9..ac8d8b7b74 100644
--- a/openpype/modules/timers_manager/rest_api.py
+++ b/openpype/modules/timers_manager/rest_api.py
@@ -3,6 +3,7 @@ from openpype.api import Logger
 
 log = Logger().get_logger("Event processor")
 
+
 class TimersManagerModuleRestApi:
     """
         REST API endpoint used for calling from hosts when context change
@@ -22,6 +23,11 @@ class TimersManagerModuleRestApi:
             self.prefix + "/start_timer",
             self.start_timer
         )
+        self.server_manager.add_route(
+            "POST",
+            self.prefix + "/stop_timer",
+            self.stop_timer
+        )
 
     async def start_timer(self, request):
         data = await request.json()
@@ -38,3 +44,7 @@ class TimersManagerModuleRestApi:
         self.module.stop_timers()
         self.module.start_timer(project_name, asset_name, task_name, hierarchy)
         return Response(status=200)
+
+    async def stop_timer(self, request):
+        self.module.stop_timers()
+        return Response(status=200)
diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py
index ef52d51325..91e0a0f3ec 100644
--- a/openpype/plugins/publish/extract_burnin.py
+++ b/openpype/plugins/publish/extract_burnin.py
@@ -44,7 +44,8 @@ class ExtractBurnin(openpype.api.Extractor):
         "harmony",
         "fusion",
         "aftereffects",
-        "tvpaint"
+        "tvpaint",
+        "aftereffects"
         # "resolve"
     ]
     optional = True
diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py
index de54b554e3..bdcd3b8e60 100644
--- a/openpype/plugins/publish/extract_review.py
+++ b/openpype/plugins/publish/extract_review.py
@@ -44,7 +44,8 @@ class ExtractReview(pyblish.api.InstancePlugin):
         "standalonepublisher",
         "fusion",
         "tvpaint",
-        "resolve"
+        "resolve",
+        "aftereffects"
     ]
 
     # Supported extensions
diff --git a/openpype/plugins/publish/integrate_new.py b/openpype/plugins/publish/integrate_new.py
index c5ce6d23aa..3504206fe1 100644
--- a/openpype/plugins/publish/integrate_new.py
+++ b/openpype/plugins/publish/integrate_new.py
@@ -303,6 +303,8 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
         key_values = {"families": family, "tasks": task_name}
         profile = filter_profiles(self.template_name_profiles, key_values,
                                   logger=self.log)
+
+        template_name = "publish"
         if profile:
             template_name = profile["template_name"]
 
@@ -380,7 +382,12 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
 
                 test_dest_files = list()
                 for i in [1, 2]:
-                    template_data["frame"] = src_padding_exp % i
+                    template_data["representation"] = repre['ext']
+                    if not repre.get("udim"):
+                        template_data["frame"] = src_padding_exp % i
+                    else:
+                        template_data["udim"] = src_padding_exp % i
+
                     anatomy_filled = anatomy.format(template_data)
                     template_filled = anatomy_filled[template_name]["path"]
                     if repre_context is None:
@@ -388,7 +395,10 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                     test_dest_files.append(
                         os.path.normpath(template_filled)
                     )
-                template_data["frame"] = repre_context["frame"]
+                if not repre.get("udim"):
+                    template_data["frame"] = repre_context["frame"]
+                else:
+                    template_data["udim"] = repre_context["udim"]
 
                 self.log.debug(
                     "test_dest_files: {}".format(str(test_dest_files)))
@@ -453,7 +463,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                         dst_start_frame = dst_padding
 
                 # Store used frame value to template data
-                template_data["frame"] = dst_start_frame
+                if repre.get("frame"):
+                    template_data["frame"] = dst_start_frame
+
                 dst = "{0}{1}{2}".format(
                     dst_head,
                     dst_start_frame,
@@ -476,6 +488,10 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                     "Given file name is a full path"
                 )
 
+                template_data["representation"] = repre['ext']
+                # Store used frame value to template data
+                if repre.get("udim"):
+                    template_data["udim"] = repre["udim"][0]
                 src = os.path.join(stagingdir, fname)
                 anatomy_filled = anatomy.format(template_data)
                 template_filled = anatomy_filled[template_name]["path"]
@@ -488,6 +504,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 repre['published_path'] = dst
                 self.log.debug("__ dst: {}".format(dst))
 
+            if repre.get("udim"):
+                repre_context["udim"] = repre.get("udim")  # store list
+
             repre["publishedFiles"] = published_files
 
             for key in self.db_representation_context_keys:
@@ -1045,6 +1064,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                                 )
                             )
                             shutil.copy(file_url, new_name)
+                            os.remove(file_url)
                         else:
                             self.log.debug(
                                 "Renaming file {} to {}".format(
diff --git a/openpype/plugins/publish/validate_editorial_asset_name.py b/openpype/plugins/publish/validate_editorial_asset_name.py
index ccea42dc37..eebba61af3 100644
--- a/openpype/plugins/publish/validate_editorial_asset_name.py
+++ b/openpype/plugins/publish/validate_editorial_asset_name.py
@@ -11,11 +11,12 @@ class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
     """
 
     order = pyblish.api.ValidatorOrder
-    label = "Validate Asset Name"
+    label = "Validate Editorial Asset Name"
 
     def process(self, context):
 
         asset_and_parents = self.get_parents(context)
+        self.log.debug("__ asset_and_parents: {}".format(asset_and_parents))
 
         if not io.Session:
             io.install()
@@ -25,7 +26,8 @@ class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
         self.log.debug("__ db_assets: {}".format(db_assets))
 
         asset_db_docs = {
-            str(e["name"]): e["data"]["parents"] for e in db_assets}
+            str(e["name"]): e["data"]["parents"]
+            for e in db_assets}
 
         self.log.debug("__ project_entities: {}".format(
             pformat(asset_db_docs)))
@@ -107,6 +109,7 @@ class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
             parents = instance.data["parents"]
 
             return_dict.update({
-                asset: [p["entity_name"] for p in parents]
+                asset: [p["entity_name"] for p in parents
+                        if p["entity_type"].lower() != "project"]
             })
         return return_dict
diff --git a/openpype/plugins/publish/validate_instance_in_context.py b/openpype/plugins/publish/validate_instance_in_context.py
index 29f002f142..61b4d82027 100644
--- a/openpype/plugins/publish/validate_instance_in_context.py
+++ b/openpype/plugins/publish/validate_instance_in_context.py
@@ -92,15 +92,16 @@ class RepairSelectInvalidInstances(pyblish.api.Action):
 
         context_asset = context.data["assetEntity"]["name"]
         for instance in instances:
-            self.set_attribute(instance, context_asset)
+            if "nuke" in pyblish.api.registered_hosts():
+                import openpype.hosts.nuke.api as nuke_api
+                origin_node = instance[0]
+                nuke_api.lib.recreate_instance(
+                    origin_node, avalon_data={"asset": context_asset}
+                )
+            else:
+                self.set_attribute(instance, context_asset)
 
     def set_attribute(self, instance, context_asset):
-        if "nuke" in pyblish.api.registered_hosts():
-            import nuke
-            nuke.toNode(
-                instance.data.get("name")
-            )["avalon:asset"].setValue(context_asset)
-
         if "maya" in pyblish.api.registered_hosts():
             from maya import cmds
             cmds.setAttr(
diff --git a/openpype/scripts/otio_burnin.py b/openpype/scripts/otio_burnin.py
index ca77171981..dc8d60cb37 100644
--- a/openpype/scripts/otio_burnin.py
+++ b/openpype/scripts/otio_burnin.py
@@ -113,6 +113,10 @@ def _h264_codec_args(ffprobe_data):
 
     output.extend(["-codec:v", "h264"])
 
+    bit_rate = ffprobe_data.get("bit_rate")
+    if bit_rate:
+        output.extend(["-b:v", bit_rate])
+
     pix_fmt = ffprobe_data.get("pix_fmt")
     if pix_fmt:
         output.extend(["-pix_fmt", pix_fmt])
diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json
index 63477b9d82..53abd35ed5 100644
--- a/openpype/settings/defaults/project_anatomy/templates.json
+++ b/openpype/settings/defaults/project_anatomy/templates.json
@@ -17,7 +17,7 @@
     },
     "publish": {
         "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}",
-        "file": "{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{ext}",
+        "file": "{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}><_{udim}>.{ext}",
         "path": "{@folder}/{@file}",
         "thumbnail": "{thumbnail_root}/{project[name]}/{_id}_{thumbnail_type}.{ext}"
     },
diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index 2cc345d5ad..efeafbb1ac 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -3,9 +3,37 @@
         "ValidateExpectedFiles": {
             "enabled": true,
             "active": true,
-            "families": ["render"],
-            "targets": ["deadline"],
-            "allow_user_override": true
+            "allow_user_override": true,
+            "families": [
+                "render"
+            ],
+            "targets": [
+                "deadline"
+            ]
+        },
+        "ProcessSubmittedJobOnFarm": {
+            "enabled": true,
+            "deadline_department": "",
+            "deadline_pool": "",
+            "deadline_group": "",
+            "deadline_chunk_size": 1,
+            "deadline_priority": 50,
+            "publishing_script": "",
+            "skip_integration_repre_list": [],
+            "aov_filter": {
+                "maya": [
+                    ".+(?:\\.|_)([Bb]eauty)(?:\\.|_).*"
+                ],
+                "nuke": [
+                    ".*"
+                ],
+                "aftereffects": [
+                    ".*"
+                ],
+                "celaction": [
+                    ".*"
+                ]
+            }
         },
         "MayaSubmitDeadline": {
             "enabled": true,
@@ -15,7 +43,10 @@
             "use_published": true,
             "asset_dependencies": true,
             "group": "none",
-            "limit": []
+            "limit": [],
+            "jobInfo": {},
+            "pluginInfo": {},
+            "scene_patches": []
         },
         "NukeSubmitDeadline": {
             "enabled": true,
@@ -29,6 +60,8 @@
             "group": "",
             "department": "",
             "use_gpu": true,
+            "env_allowed_keys": [],
+            "env_search_replace_values": {},
             "limit_groups": {}
         },
         "HarmonySubmitDeadline": {
diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json
index 88f4e1e2e7..9fa78ac588 100644
--- a/openpype/settings/defaults/project_settings/ftrack.json
+++ b/openpype/settings/defaults/project_settings/ftrack.json
@@ -136,7 +136,8 @@
                 "Pypeclub",
                 "Administrator",
                 "Project manager"
-            ]
+            ],
+            "create_project_structure_checked": false
         },
         "clean_hierarchical_attr": {
             "enabled": true,
@@ -229,7 +230,6 @@
                         "standalonepublisher"
                     ],
                     "families": [
-                        "review",
                         "plate"
                     ],
                     "tasks": [],
@@ -279,6 +279,36 @@
                     "tasks": [],
                     "add_ftrack_family": true,
                     "advanced_filtering": []
+                },
+                {
+                    "hosts": [
+                        "nuke"
+                    ],
+                    "families": [
+                        "write",
+                        "render"
+                    ],
+                    "tasks": [],
+                    "add_ftrack_family": false,
+                    "advanced_filtering": [
+                        {
+                            "families": [
+                                "review"
+                            ],
+                            "add_ftrack_family": true
+                        }
+                    ]
+                },
+                {
+                    "hosts": [
+                        "aftereffects"
+                    ],
+                    "families": [
+                        "render"
+                    ],
+                    "tasks": [],
+                    "add_ftrack_family": true,
+                    "advanced_filtering": []
                 }
             ]
         },
diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json
index 037fa63a29..aab8c2196c 100644
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@@ -1,5 +1,13 @@
 {
     "publish": {
+        "ValidateEditorialAssetName": {
+            "enabled": true,
+            "optional": false
+        },
+        "ValidateVersion": {
+            "enabled": true,
+            "optional": false
+        },
         "IntegrateHeroVersion": {
             "enabled": true,
             "optional": true,
@@ -165,25 +173,9 @@
                 }
             ]
         },
-        "ProcessSubmittedJobOnFarm": {
-            "enabled": true,
-            "deadline_department": "",
-            "deadline_pool": "",
-            "deadline_group": "",
-            "deadline_chunk_size": 1,
-            "deadline_priority": 50,
-            "aov_filter": {
-                "maya": [
-                    ".+(?:\\.|_)([Bb]eauty)(?:\\.|_).*"
-                ],
-                "nuke": [],
-                "aftereffects": [
-                    ".*"
-                ],
-                "celaction": [
-                    ".*"
-                ]
-            }
+        "CleanUp": {
+            "paterns": [],
+            "remove_temp_renders": false
         }
     },
     "tools": {
@@ -243,6 +235,16 @@
                     ],
                     "tasks": [],
                     "template": "{family}{Task}"
+                },
+                {
+                    "families": [
+                        "renderLocal"
+                    ],
+                    "hosts": [
+                        "aftereffects"
+                    ],
+                    "tasks": [],
+                    "template": "render{Task}{Variant}"
                 }
             ]
         },
@@ -254,6 +256,13 @@
                     "enabled": true
                 }
             ],
+            "open_workfile_tool_on_startup": [
+                {
+                    "hosts": [],
+                    "tasks": [],
+                    "enabled": false
+                }
+            ],
             "sw_folders": {
                 "compositing": [
                     "nuke",
@@ -271,28 +280,7 @@
             }
         }
     },
-    "project_folder_structure": {
-        "__project_root__": {
-            "prod": {},
-            "resources": {
-                "footage": {
-                    "plates": {},
-                    "offline": {}
-                },
-                "audio": {},
-                "art_dept": {}
-            },
-            "editorial": {},
-            "assets[ftrack.Library]": {
-                "characters[ftrack]": {},
-                "locations[ftrack]": {}
-            },
-            "shots[ftrack.Sequence]": {
-                "scripts": {},
-                "editorial[ftrack.Folder]": {}
-            }
-        }
-    },
+    "project_folder_structure": "{\"__project_root__\": {\"prod\": {}, \"resources\": {\"footage\": {\"plates\": {}, \"offline\": {}}, \"audio\": {}, \"art_dept\": {}}, \"editorial\": {}, \"assets[ftrack.Library]\": {\"characters[ftrack]\": {}, \"locations[ftrack]\": {}}, \"shots[ftrack.Sequence]\": {\"scripts\": {}, \"editorial[ftrack.Folder]\": {}}}}",
     "sync_server": {
         "enabled": true,
         "config": {
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 284a1a0040..592b424fd8 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -7,6 +7,35 @@
         "workfile": "ma",
         "yetiRig": "ma"
     },
+    "maya-dirmap": {
+        "enabled": true,
+        "paths": {
+            "source-path": [
+                "foo1",
+                "foo2"
+            ],
+            "destination-path": [
+                "bar1",
+                "bar2"
+            ]
+        }
+    },
+    "scriptsmenu": {
+        "name": "OpenPype Tools",
+        "definition": [
+            {
+                "type": "action",
+                "command": "import openpype.hosts.maya.api.commands as op_cmds; op_cmds.edit_shader_definitions()",
+                "sourcetype": "python",
+                "title": "Edit shader name definitions",
+                "tooltip": "Edit shader name definitions used in validation and renaming.",
+                "tags": [
+                    "pipeline",
+                    "shader"
+                ]
+            }
+        ]
+    },
     "create": {
         "CreateLook": {
             "enabled": true,
@@ -148,12 +177,14 @@
         },
         "ValidateModelName": {
             "enabled": false,
+            "database": true,
             "material_file": {
                 "windows": "",
                 "darwin": "",
                 "linux": ""
             },
-            "regex": "(.*)_(\\\\d)*_(.*)_(GEO)"
+            "regex": "(.*)_(\\d)*_(?P<shader>.*)_(GEO)",
+            "top_level_regex": ".*_GRP"
         },
         "ValidateTransformNamingSuffix": {
             "enabled": true,
diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json
index 71bf46d5b3..136f1d6b42 100644
--- a/openpype/settings/defaults/project_settings/nuke.json
+++ b/openpype/settings/defaults/project_settings/nuke.json
@@ -10,11 +10,22 @@
     },
     "create": {
         "CreateWriteRender": {
-            "fpath_template": "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}"
+            "fpath_template": "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}",
+            "defaults": [
+                "Main",
+                "Mask"
+            ]
         },
         "CreateWritePrerender": {
             "fpath_template": "{work}/prerenders/nuke/{subset}/{subset}.{frame}.{ext}",
-            "use_range_limit": true
+            "use_range_limit": true,
+            "defaults": [
+                "Key01",
+                "Bg01",
+                "Fg01",
+                "Branch01",
+                "Part01"
+            ]
         }
     },
     "publish": {
diff --git a/openpype/settings/defaults/project_settings/standalonepublisher.json b/openpype/settings/defaults/project_settings/standalonepublisher.json
index 443203951d..50c1e34366 100644
--- a/openpype/settings/defaults/project_settings/standalonepublisher.json
+++ b/openpype/settings/defaults/project_settings/standalonepublisher.json
@@ -123,6 +123,16 @@
             ],
             "help": "Process multiple Mov files and publish them for layout and comp."
         },
+        "create_texture_batch": {
+            "name": "texture_batch",
+            "label": "Texture Batch",
+            "family": "texture_batch",
+            "icon": "image",
+            "defaults": [
+                "Main"
+            ],
+            "help": "Texture files with UDIM together with worfile"
+        },
         "__dynamic_keys_labels__": {
             "create_workfile": "Workfile",
             "create_model": "Model",
@@ -134,10 +144,65 @@
             "create_image": "Image",
             "create_matchmove": "Matchmove",
             "create_render": "Render",
-            "create_mov_batch": "Batch Mov"
+            "create_mov_batch": "Batch Mov",
+            "create_texture_batch": "Batch Texture"
         }
     },
     "publish": {
+        "CollectTextures": {
+            "enabled": true,
+            "active": true,
+            "main_workfile_extensions": [
+                "mra"
+            ],
+            "other_workfile_extensions": [
+                "spp",
+                "psd"
+            ],
+            "texture_extensions": [
+                "exr",
+                "dpx",
+                "jpg",
+                "jpeg",
+                "png",
+                "tiff",
+                "tga",
+                "gif",
+                "svg"
+            ],
+            "workfile_families": [],
+            "texture_families": [],
+            "color_space": [
+                "linsRGB",
+                "raw",
+                "acesg"
+            ],
+            "input_naming_patterns": {
+                "workfile": [
+                    "^([^.]+)(_[^_.]*)?_v([0-9]{3,}).+"
+                ],
+                "textures": [
+                    "^([^_.]+)_([^_.]+)_v([0-9]{3,})_([^_.]+)_({color_space})_(1[0-9]{3}).+"
+                ]
+            },
+            "input_naming_groups": {
+                "workfile": [
+                    "asset",
+                    "filler",
+                    "version"
+                ],
+                "textures": [
+                    "asset",
+                    "shader",
+                    "version",
+                    "channel",
+                    "color_space",
+                    "udim"
+                ]
+            },
+            "workfile_subset_template": "textures{Subset}Workfile",
+            "texture_subset_template": "textures{Subset}_{Shader}_{Channel}"
+        },
         "ValidateSceneSettings": {
             "enabled": true,
             "optional": true,
@@ -165,6 +230,58 @@
                 ],
                 "output": []
             }
+        },
+        "CollectEditorial": {
+            "source_dir": "",
+            "extensions": [
+                "mov",
+                "mp4"
+            ]
+        },
+        "CollectHierarchyInstance": {
+            "shot_rename_template": "{project[code]}_{_sequence_}_{_shot_}",
+            "shot_rename_search_patterns": {
+                "_sequence_": "(\\d{4})(?=_\\d{4})",
+                "_shot_": "(\\d{4})(?!_\\d{4})"
+            },
+            "shot_add_hierarchy": {
+                "parents_path": "{project}/{folder}/{sequence}",
+                "parents": {
+                    "project": "{project[name]}",
+                    "sequence": "{_sequence_}",
+                    "folder": "shots"
+                }
+            },
+            "shot_add_tasks": {}
+        },
+        "CollectInstances": {
+            "custom_start_frame": 0,
+            "timeline_frame_start": 900000,
+            "timeline_frame_offset": 0,
+            "subsets": {
+                "referenceMain": {
+                    "family": "review",
+                    "families": [
+                        "clip"
+                    ],
+                    "extensions": [
+                        "mp4"
+                    ],
+                    "version": 0,
+                    "keepSequence": false
+                },
+                "audioMain": {
+                    "family": "audio",
+                    "families": [
+                        "clip"
+                    ],
+                    "extensions": [
+                        "wav"
+                    ],
+                    "version": 0,
+                    "keepSequence": false
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json
index 763802a73f..47f486aa98 100644
--- a/openpype/settings/defaults/project_settings/tvpaint.json
+++ b/openpype/settings/defaults/project_settings/tvpaint.json
@@ -18,6 +18,11 @@
             "optional": true,
             "active": true
         },
+        "ValidateStartFrame": {
+            "enabled": false,
+            "optional": true,
+            "active": true
+        },
         "ValidateAssetName": {
             "enabled": true,
             "optional": true,
diff --git a/openpype/settings/defaults/project_settings/unreal.json b/openpype/settings/defaults/project_settings/unreal.json
index 46b9ca2a18..dad61cd1f0 100644
--- a/openpype/settings/defaults/project_settings/unreal.json
+++ b/openpype/settings/defaults/project_settings/unreal.json
@@ -1,6 +1,5 @@
 {
     "project_setup": {
-        "dev_mode": true,
-        "install_unreal_python_engine": false
+        "dev_mode": true
     }
 }
\ No newline at end of file
diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json
index 224f9dc318..842c294599 100644
--- a/openpype/settings/defaults/system_settings/applications.json
+++ b/openpype/settings/defaults/system_settings/applications.json
@@ -1084,7 +1084,7 @@
     "unreal": {
         "enabled": true,
         "label": "Unreal Editor",
-        "icon": "{}/app_icons/ue4.png'",
+        "icon": "{}/app_icons/ue4.png",
         "host_name": "unreal",
         "environment": {},
         "variants": {
diff --git a/openpype/settings/entities/__init__.py b/openpype/settings/entities/__init__.py
index 94eb819f2b..c0eef15e69 100644
--- a/openpype/settings/entities/__init__.py
+++ b/openpype/settings/entities/__init__.py
@@ -111,6 +111,7 @@ from .enum_entity import (
 from .list_entity import ListEntity
 from .dict_immutable_keys_entity import DictImmutableKeysEntity
 from .dict_mutable_keys_entity import DictMutableKeysEntity
+from .dict_conditional import DictConditionalEntity
 
 from .anatomy_entities import AnatomyEntity
 
@@ -166,5 +167,7 @@ __all__ = (
 
     "DictMutableKeysEntity",
 
+    "DictConditionalEntity",
+
     "AnatomyEntity"
 )
diff --git a/openpype/settings/entities/anatomy_entities.py b/openpype/settings/entities/anatomy_entities.py
index d048ffabba..489e1f8294 100644
--- a/openpype/settings/entities/anatomy_entities.py
+++ b/openpype/settings/entities/anatomy_entities.py
@@ -1,5 +1,6 @@
 from .dict_immutable_keys_entity import DictImmutableKeysEntity
 from .lib import OverrideState
+from .exceptions import EntitySchemaError
 
 
 class AnatomyEntity(DictImmutableKeysEntity):
@@ -23,3 +24,25 @@ class AnatomyEntity(DictImmutableKeysEntity):
             if not child_obj.has_project_override:
                 child_obj.add_to_project_override()
         return super(AnatomyEntity, self).on_child_change(child_obj)
+
+    def schema_validations(self):
+        non_group_children = []
+        for key, child_obj in self.non_gui_children.items():
+            if not child_obj.is_group:
+                non_group_children.append(key)
+
+        if non_group_children:
+            _non_group_children = [
+                "project_anatomy/{}".format(key)
+                for key in non_group_children
+            ]
+            reason = (
+                "Anatomy must have all children as groups."
+                " Set 'is_group' to `true` on > {}"
+            ).format(", ".join([
+                '"{}"'.format(item)
+                for item in _non_group_children
+            ]))
+            raise EntitySchemaError(self, reason)
+
+        return super(AnatomyEntity, self).schema_validations()
diff --git a/openpype/settings/entities/base_entity.py b/openpype/settings/entities/base_entity.py
index 82705d1406..b4ebe885f5 100644
--- a/openpype/settings/entities/base_entity.py
+++ b/openpype/settings/entities/base_entity.py
@@ -136,6 +136,7 @@ class BaseItemEntity(BaseEntity):
         # Override state defines which values are used, saved and how.
         # TODO convert to private attribute
         self._override_state = OverrideState.NOT_DEFINED
+        self._ignore_missing_defaults = None
 
         # These attributes may change values during existence of an object
         # Default value, studio override values and project override values
@@ -285,7 +286,7 @@ class BaseItemEntity(BaseEntity):
         pass
 
     @abstractmethod
-    def set_override_state(self, state):
+    def set_override_state(self, state, ignore_missing_defaults):
         """Set override state and trigger it on children.
 
         Method discard all changes in hierarchy and use values, metadata
@@ -295,8 +296,15 @@ class BaseItemEntity(BaseEntity):
         Should start on root entity and when triggered then must be called on
         all entities in hierarchy.
 
+        Argument `ignore_missing_defaults` should be used when entity has
+        children that are not saved or used all the time but override statu
+        must be changed and children must have any default value.
+
         Args:
             state (OverrideState): State to which should be data changed.
+            ignore_missing_defaults (bool): Ignore missing default values.
+                Entity won't raise `DefaultsNotDefined` and
+                `StudioDefaultsNotDefined`.
         """
         pass
 
diff --git a/openpype/settings/entities/dict_conditional.py b/openpype/settings/entities/dict_conditional.py
new file mode 100644
index 0000000000..b7c64f173f
--- /dev/null
+++ b/openpype/settings/entities/dict_conditional.py
@@ -0,0 +1,723 @@
+import copy
+
+from .lib import (
+    OverrideState,
+    NOT_SET
+)
+from openpype.settings.constants import (
+    METADATA_KEYS,
+    M_OVERRIDEN_KEY,
+    KEY_REGEX
+)
+from . import (
+    BaseItemEntity,
+    ItemEntity,
+    GUIEntity
+)
+from .exceptions import (
+    SchemaDuplicatedKeys,
+    EntitySchemaError,
+    InvalidKeySymbols
+)
+
+
+class DictConditionalEntity(ItemEntity):
+    """Entity represents dictionay with only one persistent key definition.
+
+    The persistent key is enumerator which define rest of children under
+    dictionary. There is not possibility of shared children.
+
+    Entity's keys can't be removed or added. But they may change based on
+    the persistent key. If you're change value manually (key by key) make sure
+    you'll change value of the persistent key as first. It is recommended to
+    use `set` method which handle this for you.
+
+    It is possible to use entity similar way as `dict` object. Returned values
+    are not real settings values but entities representing the value.
+    """
+    schema_types = ["dict-conditional"]
+    _default_label_wrap = {
+        "use_label_wrap": False,
+        "collapsible": False,
+        "collapsed": True
+    }
+
+    def __getitem__(self, key):
+        """Return entity inder key."""
+        if key == self.enum_key:
+            return self.enum_entity
+        return self.non_gui_children[self.current_enum][key]
+
+    def __setitem__(self, key, value):
+        """Set value of item under key."""
+        if key == self.enum_key:
+            child_obj = self.enum_entity
+        else:
+            child_obj = self.non_gui_children[self.current_enum][key]
+        child_obj.set(value)
+
+    def __iter__(self):
+        """Iter through keys."""
+        for key in self.keys():
+            yield key
+
+    def __contains__(self, key):
+        """Check if key is available."""
+        if key == self.enum_key:
+            return True
+        return key in self.non_gui_children[self.current_enum]
+
+    def get(self, key, default=None):
+        """Safe entity getter by key."""
+        if key == self.enum_key:
+            return self.enum_entity
+        return self.non_gui_children[self.current_enum].get(key, default)
+
+    def keys(self):
+        """Entity's keys."""
+        keys = list(self.non_gui_children[self.current_enum].keys())
+        keys.insert(0, [self.enum_key])
+        return keys
+
+    def values(self):
+        """Children entities."""
+        values = [
+            self.enum_entity
+        ]
+        for child_entiy in self.non_gui_children[self.current_enum].values():
+            values.append(child_entiy)
+        return values
+
+    def items(self):
+        """Children entities paired with their key (key, value)."""
+        items = [
+            (self.enum_key, self.enum_entity)
+        ]
+        for key, value in self.non_gui_children[self.current_enum].items():
+            items.append((key, value))
+        return items
+
+    def set(self, value):
+        """Set value."""
+        new_value = self.convert_to_valid_type(value)
+        # First change value of enum key if available
+        if self.enum_key in new_value:
+            self.enum_entity.set(new_value.pop(self.enum_key))
+
+        for _key, _value in new_value.items():
+            self.non_gui_children[self.current_enum][_key].set(_value)
+
+    def _item_initalization(self):
+        self._default_metadata = NOT_SET
+        self._studio_override_metadata = NOT_SET
+        self._project_override_metadata = NOT_SET
+
+        self._ignore_child_changes = False
+
+        # `current_metadata` are still when schema is loaded
+        # - only metadata stored with dict item are gorup overrides in
+        #   M_OVERRIDEN_KEY
+        self._current_metadata = {}
+        self._metadata_are_modified = False
+
+        # Entity must be group or in group
+        if (
+            self.group_item is None
+            and not self.is_dynamic_item
+            and not self.is_in_dynamic_item
+        ):
+            self.is_group = True
+
+        # Children are stored by key as keys are immutable and are defined by
+        # schema
+        self.valid_value_types = (dict, )
+        self.children = {}
+        self.non_gui_children = {}
+        self.gui_layout = {}
+
+        if self.is_dynamic_item:
+            self.require_key = False
+
+        self.enum_key = self.schema_data.get("enum_key")
+        self.enum_label = self.schema_data.get("enum_label")
+        self.enum_children = self.schema_data.get("enum_children")
+        self.enum_default = self.schema_data.get("enum_default")
+
+        self.enum_entity = None
+
+        # GUI attributes
+        self.enum_is_horizontal = self.schema_data.get(
+            "enum_is_horizontal", False
+        )
+        # `enum_on_right` can be used only if
+        self.enum_on_right = self.schema_data.get("enum_on_right", False)
+
+        self.highlight_content = self.schema_data.get(
+            "highlight_content", False
+        )
+        self.show_borders = self.schema_data.get("show_borders", True)
+
+        self._add_children()
+
+    @property
+    def current_enum(self):
+        """Current value of enum entity.
+
+        This value define what children are used.
+        """
+        if self.enum_entity is None:
+            return None
+        return self.enum_entity.value
+
+    def schema_validations(self):
+        """Validation of schema data."""
+        # Enum key must be defined
+        if self.enum_key is None:
+            raise EntitySchemaError(self, "Key 'enum_key' is not set.")
+
+        # Validate type of enum children
+        if not isinstance(self.enum_children, list):
+            raise EntitySchemaError(
+                self, "Key 'enum_children' must be a list. Got: {}".format(
+                    str(type(self.enum_children))
+                )
+            )
+
+        # Without defined enum children entity has nothing to do
+        if not self.enum_children:
+            raise EntitySchemaError(self, (
+                "Key 'enum_children' have empty value. Entity can't work"
+                " without children definitions."
+            ))
+
+        children_def_keys = []
+        for children_def in self.enum_children:
+            if not isinstance(children_def, dict):
+                raise EntitySchemaError(self, (
+                    "Children definition under key 'enum_children' must"
+                    " be a dictionary."
+                ))
+
+            if "key" not in children_def:
+                raise EntitySchemaError(self, (
+                    "Children definition under key 'enum_children' miss"
+                    " 'key' definition."
+                ))
+            # We don't validate regex of these keys because they will be stored
+            #   as value at the end.
+            key = children_def["key"]
+            if key in children_def_keys:
+                # TODO this hould probably be different exception?
+                raise SchemaDuplicatedKeys(self, key)
+            children_def_keys.append(key)
+
+        # Validate key duplications per each enum item
+        for children in self.children.values():
+            children_keys = set()
+            children_keys.add(self.enum_key)
+            for child_entity in children:
+                if not isinstance(child_entity, BaseItemEntity):
+                    continue
+                elif child_entity.key not in children_keys:
+                    children_keys.add(child_entity.key)
+                else:
+                    raise SchemaDuplicatedKeys(self, child_entity.key)
+
+        # Enum key must match key regex
+        if not KEY_REGEX.match(self.enum_key):
+            raise InvalidKeySymbols(self.path, self.enum_key)
+
+        # Validate all remaining keys with key regex
+        for children_by_key in self.non_gui_children.values():
+            for key in children_by_key.keys():
+                if not KEY_REGEX.match(key):
+                    raise InvalidKeySymbols(self.path, key)
+
+        super(DictConditionalEntity, self).schema_validations()
+        # Trigger schema validation on children entities
+        for children in self.children.values():
+            for child_obj in children:
+                child_obj.schema_validations()
+
+    def on_change(self):
+        """Update metadata on change and pass change to parent."""
+        self._update_current_metadata()
+
+        for callback in self.on_change_callbacks:
+            callback()
+        self.parent.on_child_change(self)
+
+    def on_child_change(self, child_obj):
+        """Trigger on change callback if child changes are not ignored."""
+        if self._ignore_child_changes:
+            return
+
+        if (
+            child_obj is self.enum_entity
+            or child_obj in self.children[self.current_enum]
+        ):
+            self.on_change()
+
+    def _add_children(self):
+        """Add children from schema data and repare enum items.
+
+        Each enum item must have defined it's children. None are shared across
+        all enum items.
+
+        Nice to have: Have ability to have shared keys across all enum items.
+
+        All children are stored by their enum item.
+        """
+        # Skip if are not defined
+        # - schema validations should raise and exception
+        if not self.enum_children or not self.enum_key:
+            return
+
+        valid_enum_items = []
+        for item in self.enum_children:
+            if isinstance(item, dict) and "key" in item:
+                valid_enum_items.append(item)
+
+        enum_keys = []
+        enum_items = []
+        for item in valid_enum_items:
+            item_key = item["key"]
+            enum_keys.append(item_key)
+            item_label = item.get("label") or item_key
+            enum_items.append({item_key: item_label})
+
+        if not enum_items:
+            return
+
+        if self.enum_default in enum_keys:
+            default_key = self.enum_default
+        else:
+            default_key = enum_keys[0]
+
+        # Create Enum child first
+        enum_key = self.enum_key or "invalid"
+        enum_schema = {
+            "type": "enum",
+            "multiselection": False,
+            "enum_items": enum_items,
+            "key": enum_key,
+            "label": self.enum_label,
+            "default": default_key
+        }
+
+        enum_entity = self.create_schema_object(enum_schema, self)
+        self.enum_entity = enum_entity
+
+        # Create children per each enum item
+        for item in valid_enum_items:
+            item_key = item["key"]
+            # Make sure all keys have set value in these variables
+            # - key 'children' is optional
+            self.non_gui_children[item_key] = {}
+            self.children[item_key] = []
+            self.gui_layout[item_key] = []
+
+            children = item.get("children") or []
+            for children_schema in children:
+                child_obj = self.create_schema_object(children_schema, self)
+                self.children[item_key].append(child_obj)
+                self.gui_layout[item_key].append(child_obj)
+                if isinstance(child_obj, GUIEntity):
+                    continue
+
+                self.non_gui_children[item_key][child_obj.key] = child_obj
+
+    def get_child_path(self, child_obj):
+        """Get hierarchical path of child entity.
+
+        Child must be entity's direct children. This must be possible to get
+        for any children even if not from current enum value.
+        """
+        if child_obj is self.enum_entity:
+            return "/".join([self.path, self.enum_key])
+
+        result_key = None
+        for children in self.non_gui_children.values():
+            for key, _child_obj in children.items():
+                if _child_obj is child_obj:
+                    result_key = key
+                    break
+
+        if result_key is None:
+            raise ValueError("Didn't found child {}".format(child_obj))
+
+        return "/".join([self.path, result_key])
+
+    def _update_current_metadata(self):
+        current_metadata = {}
+        for key, child_obj in self.non_gui_children[self.current_enum].items():
+            if self._override_state is OverrideState.DEFAULTS:
+                break
+
+            if not child_obj.is_group:
+                continue
+
+            if (
+                self._override_state is OverrideState.STUDIO
+                and not child_obj.has_studio_override
+            ):
+                continue
+
+            if (
+                self._override_state is OverrideState.PROJECT
+                and not child_obj.has_project_override
+            ):
+                continue
+
+            if M_OVERRIDEN_KEY not in current_metadata:
+                current_metadata[M_OVERRIDEN_KEY] = []
+            current_metadata[M_OVERRIDEN_KEY].append(key)
+
+        # Define if current metadata are avaialble for current override state
+        metadata = NOT_SET
+        if self._override_state is OverrideState.STUDIO:
+            metadata = self._studio_override_metadata
+
+        elif self._override_state is OverrideState.PROJECT:
+            metadata = self._project_override_metadata
+
+        if metadata is NOT_SET:
+            metadata = {}
+
+        self._metadata_are_modified = current_metadata != metadata
+        self._current_metadata = current_metadata
+
+    def set_override_state(self, state, ignore_missing_defaults):
+        # Trigger override state change of root if is not same
+        if self.root_item.override_state is not state:
+            self.root_item.set_override_state(state)
+            return
+
+        # Change has/had override states
+        self._override_state = state
+        self._ignore_missing_defaults = ignore_missing_defaults
+
+        # Set override state on enum entity first
+        self.enum_entity.set_override_state(state, ignore_missing_defaults)
+
+        # Set override state on other enum children
+        # - these must not raise exception about missing defaults
+        for children_by_key in self.non_gui_children.values():
+            for child_obj in children_by_key.values():
+                child_obj.set_override_state(state, True)
+
+        self._update_current_metadata()
+
+    @property
+    def value(self):
+        output = {
+            self.enum_key: self.enum_entity.value
+        }
+        for key, child_obj in self.non_gui_children[self.current_enum].items():
+            output[key] = child_obj.value
+        return output
+
+    @property
+    def has_unsaved_changes(self):
+        if self._metadata_are_modified:
+            return True
+
+        return self._child_has_unsaved_changes
+
+    @property
+    def _child_has_unsaved_changes(self):
+        if self.enum_entity.has_unsaved_changes:
+            return True
+
+        for child_obj in self.non_gui_children[self.current_enum].values():
+            if child_obj.has_unsaved_changes:
+                return True
+        return False
+
+    @property
+    def has_studio_override(self):
+        return self._child_has_studio_override
+
+    @property
+    def _child_has_studio_override(self):
+        if self._override_state >= OverrideState.STUDIO:
+            if self.enum_entity.has_studio_override:
+                return True
+
+            for child_obj in self.non_gui_children[self.current_enum].values():
+                if child_obj.has_studio_override:
+                    return True
+        return False
+
+    @property
+    def has_project_override(self):
+        return self._child_has_project_override
+
+    @property
+    def _child_has_project_override(self):
+        if self._override_state >= OverrideState.PROJECT:
+            if self.enum_entity.has_project_override:
+                return True
+
+            for child_obj in self.non_gui_children[self.current_enum].values():
+                if child_obj.has_project_override:
+                    return True
+        return False
+
+    def settings_value(self):
+        if self._override_state is OverrideState.NOT_DEFINED:
+            return NOT_SET
+
+        if self._override_state is OverrideState.DEFAULTS:
+            children_items = [
+                (self.enum_key, self.enum_entity)
+            ]
+            for item in self.non_gui_children[self.current_enum].items():
+                children_items.append(item)
+
+            output = {}
+            for key, child_obj in children_items:
+                child_value = child_obj.settings_value()
+                if not child_obj.is_file and not child_obj.file_item:
+                    for _key, _value in child_value.items():
+                        new_key = "/".join([key, _key])
+                        output[new_key] = _value
+                else:
+                    output[key] = child_value
+            return output
+
+        if self.is_group:
+            if self._override_state is OverrideState.STUDIO:
+                if not self.has_studio_override:
+                    return NOT_SET
+            elif self._override_state is OverrideState.PROJECT:
+                if not self.has_project_override:
+                    return NOT_SET
+
+        output = {}
+        children_items = [
+            (self.enum_key, self.enum_entity)
+        ]
+        for item in self.non_gui_children[self.current_enum].items():
+            children_items.append(item)
+
+        for key, child_obj in children_items:
+            value = child_obj.settings_value()
+            if value is not NOT_SET:
+                output[key] = value
+
+        if not output:
+            return NOT_SET
+
+        output.update(self._current_metadata)
+        return output
+
+    def _prepare_value(self, value):
+        if value is NOT_SET or self.enum_key not in value:
+            return NOT_SET, NOT_SET
+
+        enum_value = value.get(self.enum_key)
+        if enum_value not in self.non_gui_children:
+            return NOT_SET, NOT_SET
+
+        # Create copy of value before poping values
+        value = copy.deepcopy(value)
+        metadata = {}
+        for key in METADATA_KEYS:
+            if key in value:
+                metadata[key] = value.pop(key)
+
+        enum_value = value.get(self.enum_key)
+
+        old_metadata = metadata.get(M_OVERRIDEN_KEY)
+        if old_metadata:
+            old_metadata_set = set(old_metadata)
+            new_metadata = []
+            non_gui_children = self.non_gui_children[enum_value]
+            for key in non_gui_children.keys():
+                if key in old_metadata:
+                    new_metadata.append(key)
+                    old_metadata_set.remove(key)
+
+            for key in old_metadata_set:
+                new_metadata.append(key)
+            metadata[M_OVERRIDEN_KEY] = new_metadata
+
+        return value, metadata
+
+    def update_default_value(self, value):
+        """Update default values.
+
+        Not an api method, should be called by parent.
+        """
+        value = self._check_update_value(value, "default")
+        self.has_default_value = value is not NOT_SET
+        # TODO add value validation
+        value, metadata = self._prepare_value(value)
+        self._default_metadata = metadata
+
+        if value is NOT_SET:
+            self.enum_entity.update_default_value(value)
+            for children_by_key in self.non_gui_children.values():
+                for child_obj in children_by_key.values():
+                    child_obj.update_default_value(value)
+            return
+
+        value_keys = set(value.keys())
+        enum_value = value[self.enum_key]
+        expected_keys = set(self.non_gui_children[enum_value].keys())
+        expected_keys.add(self.enum_key)
+        unknown_keys = value_keys - expected_keys
+        if unknown_keys:
+            self.log.warning(
+                "{} Unknown keys in default values: {}".format(
+                    self.path,
+                    ", ".join("\"{}\"".format(key) for key in unknown_keys)
+                )
+            )
+
+        self.enum_entity.update_default_value(enum_value)
+        for children_by_key in self.non_gui_children.values():
+            for key, child_obj in children_by_key.items():
+                child_value = value.get(key, NOT_SET)
+                child_obj.update_default_value(child_value)
+
+    def update_studio_value(self, value):
+        """Update studio override values.
+
+        Not an api method, should be called by parent.
+        """
+        value = self._check_update_value(value, "studio override")
+        value, metadata = self._prepare_value(value)
+        self._studio_override_metadata = metadata
+        self.had_studio_override = metadata is not NOT_SET
+
+        if value is NOT_SET:
+            self.enum_entity.update_studio_value(value)
+            for children_by_key in self.non_gui_children.values():
+                for child_obj in children_by_key.values():
+                    child_obj.update_studio_value(value)
+            return
+
+        value_keys = set(value.keys())
+        enum_value = value[self.enum_key]
+        expected_keys = set(self.non_gui_children[enum_value])
+        expected_keys.add(self.enum_key)
+        unknown_keys = value_keys - expected_keys
+        if unknown_keys:
+            self.log.warning(
+                "{} Unknown keys in studio overrides: {}".format(
+                    self.path,
+                    ", ".join("\"{}\"".format(key) for key in unknown_keys)
+                )
+            )
+
+        self.enum_entity.update_studio_value(enum_value)
+        for children_by_key in self.non_gui_children.values():
+            for key, child_obj in children_by_key.items():
+                child_value = value.get(key, NOT_SET)
+                child_obj.update_studio_value(child_value)
+
+    def update_project_value(self, value):
+        """Update project override values.
+
+        Not an api method, should be called by parent.
+        """
+        value = self._check_update_value(value, "project override")
+        value, metadata = self._prepare_value(value)
+        self._project_override_metadata = metadata
+        self.had_project_override = metadata is not NOT_SET
+
+        if value is NOT_SET:
+            self.enum_entity.update_project_value(value)
+            for children_by_key in self.non_gui_children.values():
+                for child_obj in children_by_key.values():
+                    child_obj.update_project_value(value)
+            return
+
+        value_keys = set(value.keys())
+        enum_value = value[self.enum_key]
+        expected_keys = set(self.non_gui_children[enum_value])
+        expected_keys.add(self.enum_key)
+        unknown_keys = value_keys - expected_keys
+        if unknown_keys:
+            self.log.warning(
+                "{} Unknown keys in project overrides: {}".format(
+                    self.path,
+                    ", ".join("\"{}\"".format(key) for key in unknown_keys)
+                )
+            )
+
+        self.enum_entity.update_project_value(enum_value)
+        for children_by_key in self.non_gui_children.values():
+            for key, child_obj in children_by_key.items():
+                child_value = value.get(key, NOT_SET)
+                child_obj.update_project_value(child_value)
+
+    def _discard_changes(self, on_change_trigger):
+        self._ignore_child_changes = True
+
+        self.enum_entity.discard_changes(on_change_trigger)
+        for children_by_key in self.non_gui_children.values():
+            for child_obj in children_by_key.values():
+                child_obj.discard_changes(on_change_trigger)
+
+        self._ignore_child_changes = False
+
+    def _add_to_studio_default(self, on_change_trigger):
+        self._ignore_child_changes = True
+
+        self.enum_entity.add_to_studio_default(on_change_trigger)
+        for children_by_key in self.non_gui_children.values():
+            for child_obj in children_by_key.values():
+                child_obj.add_to_studio_default(on_change_trigger)
+
+        self._ignore_child_changes = False
+
+        self._update_current_metadata()
+
+        self.parent.on_child_change(self)
+
+    def _remove_from_studio_default(self, on_change_trigger):
+        self._ignore_child_changes = True
+
+        self.enum_entity.remove_from_studio_default(on_change_trigger)
+        for children_by_key in self.non_gui_children.values():
+            for child_obj in children_by_key.values():
+                child_obj.remove_from_studio_default(on_change_trigger)
+
+        self._ignore_child_changes = False
+
+    def _add_to_project_override(self, on_change_trigger):
+        self._ignore_child_changes = True
+
+        self.enum_entity.add_to_project_override(on_change_trigger)
+        for children_by_key in self.non_gui_children.values():
+            for child_obj in children_by_key.values():
+                child_obj.add_to_project_override(on_change_trigger)
+
+        self._ignore_child_changes = False
+
+        self._update_current_metadata()
+
+        self.parent.on_child_change(self)
+
+    def _remove_from_project_override(self, on_change_trigger):
+        if self._override_state is not OverrideState.PROJECT:
+            return
+
+        self._ignore_child_changes = True
+
+        self.enum_entity.remove_from_project_override(on_change_trigger)
+        for children_by_key in self.non_gui_children.values():
+            for child_obj in children_by_key.values():
+                child_obj.remove_from_project_override(on_change_trigger)
+
+        self._ignore_child_changes = False
+
+    def reset_callbacks(self):
+        """Reset registered callbacks on entity and children."""
+        super(DictConditionalEntity, self).reset_callbacks()
+        for children in self.children.values():
+            for child_entity in children:
+                child_entity.reset_callbacks()
diff --git a/openpype/settings/entities/dict_immutable_keys_entity.py b/openpype/settings/entities/dict_immutable_keys_entity.py
index c965dc3b5a..bde5304787 100644
--- a/openpype/settings/entities/dict_immutable_keys_entity.py
+++ b/openpype/settings/entities/dict_immutable_keys_entity.py
@@ -258,7 +258,7 @@ class DictImmutableKeysEntity(ItemEntity):
         self._metadata_are_modified = current_metadata != metadata
         self._current_metadata = current_metadata
 
-    def set_override_state(self, state):
+    def set_override_state(self, state, ignore_missing_defaults):
         # Trigger override state change of root if is not same
         if self.root_item.override_state is not state:
             self.root_item.set_override_state(state)
@@ -266,9 +266,10 @@ class DictImmutableKeysEntity(ItemEntity):
 
         # Change has/had override states
         self._override_state = state
+        self._ignore_missing_defaults = ignore_missing_defaults
 
         for child_obj in self.non_gui_children.values():
-            child_obj.set_override_state(state)
+            child_obj.set_override_state(state, ignore_missing_defaults)
 
         self._update_current_metadata()
 
diff --git a/openpype/settings/entities/dict_mutable_keys_entity.py b/openpype/settings/entities/dict_mutable_keys_entity.py
index 3c2645e3e5..c3df935269 100644
--- a/openpype/settings/entities/dict_mutable_keys_entity.py
+++ b/openpype/settings/entities/dict_mutable_keys_entity.py
@@ -154,7 +154,9 @@ class DictMutableKeysEntity(EndpointEntity):
 
     def add_key(self, key):
         new_child = self._add_key(key)
-        new_child.set_override_state(self._override_state)
+        new_child.set_override_state(
+            self._override_state, self._ignore_missing_defaults
+        )
         self.on_change()
         return new_child
 
@@ -320,7 +322,7 @@ class DictMutableKeysEntity(EndpointEntity):
     def _metadata_for_current_state(self):
         return self._get_metadata_for_state(self._override_state)
 
-    def set_override_state(self, state):
+    def set_override_state(self, state, ignore_missing_defaults):
         # Trigger override state change of root if is not same
         if self.root_item.override_state is not state:
             self.root_item.set_override_state(state)
@@ -328,14 +330,22 @@ class DictMutableKeysEntity(EndpointEntity):
 
         # TODO change metadata
         self._override_state = state
+        self._ignore_missing_defaults = ignore_missing_defaults
+
         # Ignore if is dynamic item and use default in that case
         if not self.is_dynamic_item and not self.is_in_dynamic_item:
             if state > OverrideState.DEFAULTS:
-                if not self.has_default_value:
+                if (
+                    not self.has_default_value
+                    and not ignore_missing_defaults
+                ):
                     raise DefaultsNotDefined(self)
 
             elif state > OverrideState.STUDIO:
-                if not self.had_studio_override:
+                if (
+                    not self.had_studio_override
+                    and not ignore_missing_defaults
+                ):
                     raise StudioDefaultsNotDefined(self)
 
         if state is OverrideState.STUDIO:
@@ -426,7 +436,7 @@ class DictMutableKeysEntity(EndpointEntity):
 
             if label:
                 children_label_by_id[child_entity.id] = label
-            child_entity.set_override_state(state)
+            child_entity.set_override_state(state, ignore_missing_defaults)
 
         self.children_label_by_id = children_label_by_id
 
@@ -610,7 +620,9 @@ class DictMutableKeysEntity(EndpointEntity):
         if not self._can_discard_changes:
             return
 
-        self.set_override_state(self._override_state)
+        self.set_override_state(
+            self._override_state, self._ignore_missing_defaults
+        )
         on_change_trigger.append(self.on_change)
 
     def _add_to_studio_default(self, _on_change_trigger):
@@ -645,7 +657,9 @@ class DictMutableKeysEntity(EndpointEntity):
             if label:
                 children_label_by_id[child_entity.id] = label
 
-            child_entity.set_override_state(self._override_state)
+            child_entity.set_override_state(
+                self._override_state, self._ignore_missing_defaults
+            )
 
         self.children_label_by_id = children_label_by_id
 
@@ -694,7 +708,9 @@ class DictMutableKeysEntity(EndpointEntity):
             if label:
                 children_label_by_id[child_entity.id] = label
 
-            child_entity.set_override_state(self._override_state)
+            child_entity.set_override_state(
+                self._override_state, self._ignore_missing_defaults
+            )
 
         self.children_label_by_id = children_label_by_id
 
diff --git a/openpype/settings/entities/enum_entity.py b/openpype/settings/entities/enum_entity.py
index 63e0afeb47..361ad38dc5 100644
--- a/openpype/settings/entities/enum_entity.py
+++ b/openpype/settings/entities/enum_entity.py
@@ -1,3 +1,4 @@
+import copy
 from .input_entities import InputEntity
 from .exceptions import EntitySchemaError
 from .lib import (
@@ -72,21 +73,41 @@ class EnumEntity(BaseEnumEntity):
     def _item_initalization(self):
         self.multiselection = self.schema_data.get("multiselection", False)
         self.enum_items = self.schema_data.get("enum_items")
+        # Default is optional and non breaking attribute
+        enum_default = self.schema_data.get("default")
 
-        valid_keys = set()
+        all_keys = []
         for item in self.enum_items or []:
-            valid_keys.add(tuple(item.keys())[0])
+            key = tuple(item.keys())[0]
+            all_keys.append(key)
 
-        self.valid_keys = valid_keys
+        self.valid_keys = set(all_keys)
 
         if self.multiselection:
             self.valid_value_types = (list, )
-            self.value_on_not_set = []
+            value_on_not_set = []
+            if enum_default:
+                if not isinstance(enum_default, list):
+                    enum_default = [enum_default]
+
+                for item in enum_default:
+                    if item in all_keys:
+                        value_on_not_set.append(item)
+
+            self.value_on_not_set = value_on_not_set
+
         else:
-            for key in valid_keys:
-                if self.value_on_not_set is NOT_SET:
-                    self.value_on_not_set = key
-                    break
+            if isinstance(enum_default, list) and enum_default:
+                enum_default = enum_default[0]
+
+            if enum_default in self.valid_keys:
+                self.value_on_not_set = enum_default
+
+            else:
+                for key in all_keys:
+                    if self.value_on_not_set is NOT_SET:
+                        self.value_on_not_set = key
+                        break
 
             self.valid_value_types = (STRING_TYPE, )
 
@@ -118,29 +139,43 @@ class HostsEnumEntity(BaseEnumEntity):
     implementation instead of application name.
     """
     schema_types = ["hosts-enum"]
+    all_host_names = [
+        "aftereffects",
+        "blender",
+        "celaction",
+        "fusion",
+        "harmony",
+        "hiero",
+        "houdini",
+        "maya",
+        "nuke",
+        "photoshop",
+        "resolve",
+        "tvpaint",
+        "unreal",
+        "standalonepublisher"
+    ]
 
     def _item_initalization(self):
         self.multiselection = self.schema_data.get("multiselection", True)
-        self.use_empty_value = self.schema_data.get(
-            "use_empty_value", not self.multiselection
-        )
+        use_empty_value = False
+        if not self.multiselection:
+            use_empty_value = self.schema_data.get(
+                "use_empty_value", use_empty_value
+            )
+        self.use_empty_value = use_empty_value
+
+        hosts_filter = self.schema_data.get("hosts_filter") or []
+        self.hosts_filter = hosts_filter
+
         custom_labels = self.schema_data.get("custom_labels") or {}
 
-        host_names = [
-            "aftereffects",
-            "blender",
-            "celaction",
-            "fusion",
-            "harmony",
-            "hiero",
-            "houdini",
-            "maya",
-            "nuke",
-            "photoshop",
-            "resolve",
-            "tvpaint",
-            "unreal"
-        ]
+        host_names = copy.deepcopy(self.all_host_names)
+        if hosts_filter:
+            for host_name in tuple(host_names):
+                if host_name not in hosts_filter:
+                    host_names.remove(host_name)
+
         if self.use_empty_value:
             host_names.insert(0, "")
             # Add default label for empty value if not available
@@ -172,6 +207,44 @@ class HostsEnumEntity(BaseEnumEntity):
         # GUI attribute
         self.placeholder = self.schema_data.get("placeholder")
 
+    def schema_validations(self):
+        if self.hosts_filter:
+            enum_len = len(self.enum_items)
+            if (
+                enum_len == 0
+                or (enum_len == 1 and self.use_empty_value)
+            ):
+                joined_filters = ", ".join([
+                    '"{}"'.format(item)
+                    for item in self.hosts_filter
+                ])
+                reason = (
+                    "All host names were removed after applying"
+                    " host filters. {}"
+                ).format(joined_filters)
+                raise EntitySchemaError(self, reason)
+
+            invalid_filters = set()
+            for item in self.hosts_filter:
+                if item not in self.all_host_names:
+                    invalid_filters.add(item)
+
+            if invalid_filters:
+                joined_filters = ", ".join([
+                    '"{}"'.format(item)
+                    for item in self.hosts_filter
+                ])
+                expected_hosts = ", ".join([
+                    '"{}"'.format(item)
+                    for item in self.all_host_names
+                ])
+                self.log.warning((
+                    "Host filters containt invalid host names:"
+                    " \"{}\" Expected values are {}"
+                ).format(joined_filters, expected_hosts))
+
+        super(HostsEnumEntity, self).schema_validations()
+
 
 class AppsEnumEntity(BaseEnumEntity):
     schema_types = ["apps-enum"]
diff --git a/openpype/settings/entities/input_entities.py b/openpype/settings/entities/input_entities.py
index 295333eb60..6952529963 100644
--- a/openpype/settings/entities/input_entities.py
+++ b/openpype/settings/entities/input_entities.py
@@ -1,5 +1,6 @@
 import re
 import copy
+import json
 from abc import abstractmethod
 
 from .base_entity import ItemEntity
@@ -217,21 +218,28 @@ class InputEntity(EndpointEntity):
                 return True
         return False
 
-    def set_override_state(self, state):
+    def set_override_state(self, state, ignore_missing_defaults):
         # Trigger override state change of root if is not same
         if self.root_item.override_state is not state:
             self.root_item.set_override_state(state)
             return
 
         self._override_state = state
+        self._ignore_missing_defaults = ignore_missing_defaults
         # Ignore if is dynamic item and use default in that case
         if not self.is_dynamic_item and not self.is_in_dynamic_item:
             if state > OverrideState.DEFAULTS:
-                if not self.has_default_value:
+                if (
+                    not self.has_default_value
+                    and not ignore_missing_defaults
+                ):
                     raise DefaultsNotDefined(self)
 
             elif state > OverrideState.STUDIO:
-                if not self.had_studio_override:
+                if (
+                    not self.had_studio_override
+                    and not ignore_missing_defaults
+                ):
                     raise StudioDefaultsNotDefined(self)
 
         if state is OverrideState.STUDIO:
@@ -433,6 +441,7 @@ class RawJsonEntity(InputEntity):
 
     def _item_initalization(self):
         # Schema must define if valid value is dict or list
+        store_as_string = self.schema_data.get("store_as_string", False)
         is_list = self.schema_data.get("is_list", False)
         if is_list:
             valid_value_types = (list, )
@@ -441,6 +450,8 @@ class RawJsonEntity(InputEntity):
             valid_value_types = (dict, )
             value_on_not_set = {}
 
+        self.store_as_string = store_as_string
+
         self._is_list = is_list
         self.valid_value_types = valid_value_types
         self.value_on_not_set = value_on_not_set
@@ -484,6 +495,23 @@ class RawJsonEntity(InputEntity):
             result = self.metadata != self._metadata_for_current_state()
         return result
 
+    def schema_validations(self):
+        if self.store_as_string and self.is_env_group:
+            reason = (
+                "RawJson entity can't store environment group metadata"
+                " as string."
+            )
+            raise EntitySchemaError(self, reason)
+        super(RawJsonEntity, self).schema_validations()
+
+    def _convert_to_valid_type(self, value):
+        if isinstance(value, STRING_TYPE):
+            try:
+                return json.loads(value)
+            except Exception:
+                pass
+        return super(RawJsonEntity, self)._convert_to_valid_type(value)
+
     def _metadata_for_current_state(self):
         if (
             self._override_state is OverrideState.PROJECT
@@ -503,6 +531,9 @@ class RawJsonEntity(InputEntity):
         value = super(RawJsonEntity, self)._settings_value()
         if self.is_env_group and isinstance(value, dict):
             value.update(self.metadata)
+
+        if self.store_as_string:
+            return json.dumps(value)
         return value
 
     def _prepare_value(self, value):
diff --git a/openpype/settings/entities/item_entities.py b/openpype/settings/entities/item_entities.py
index 48336080b6..7e84f8c801 100644
--- a/openpype/settings/entities/item_entities.py
+++ b/openpype/settings/entities/item_entities.py
@@ -150,14 +150,15 @@ class PathEntity(ItemEntity):
     def value(self):
         return self.child_obj.value
 
-    def set_override_state(self, state):
+    def set_override_state(self, state, ignore_missing_defaults):
         # Trigger override state change of root if is not same
         if self.root_item.override_state is not state:
             self.root_item.set_override_state(state)
             return
 
         self._override_state = state
-        self.child_obj.set_override_state(state)
+        self._ignore_missing_defaults = ignore_missing_defaults
+        self.child_obj.set_override_state(state, ignore_missing_defaults)
 
     def update_default_value(self, value):
         self.child_obj.update_default_value(value)
@@ -344,25 +345,32 @@ class ListStrictEntity(ItemEntity):
                 return True
         return False
 
-    def set_override_state(self, state):
+    def set_override_state(self, state, ignore_missing_defaults):
         # Trigger override state change of root if is not same
         if self.root_item.override_state is not state:
             self.root_item.set_override_state(state)
             return
 
         self._override_state = state
+        self._ignore_missing_defaults = ignore_missing_defaults
         # Ignore if is dynamic item and use default in that case
         if not self.is_dynamic_item and not self.is_in_dynamic_item:
             if state > OverrideState.DEFAULTS:
-                if not self.has_default_value:
+                if (
+                    not self.has_default_value
+                    and not ignore_missing_defaults
+                ):
                     raise DefaultsNotDefined(self)
 
             elif state > OverrideState.STUDIO:
-                if not self.had_studio_override:
+                if (
+                    not self.had_studio_override
+                    and not ignore_missing_defaults
+                ):
                     raise StudioDefaultsNotDefined(self)
 
         for child_entity in self.children:
-            child_entity.set_override_state(state)
+            child_entity.set_override_state(state, ignore_missing_defaults)
 
         self.initial_value = self.settings_value()
 
diff --git a/openpype/settings/entities/lib.py b/openpype/settings/entities/lib.py
index 42a08232b9..01f61d8bdf 100644
--- a/openpype/settings/entities/lib.py
+++ b/openpype/settings/entities/lib.py
@@ -3,6 +3,7 @@ import re
 import json
 import copy
 import inspect
+import contextlib
 
 from .exceptions import (
     SchemaTemplateMissingKeys,
@@ -111,6 +112,10 @@ class SchemasHub:
         self._loaded_templates = {}
         self._loaded_schemas = {}
 
+        # Store validating and validated dynamic template or schemas
+        self._validating_dynamic = set()
+        self._validated_dynamic = set()
+
         # It doesn't make sence to reload types on each reset as they can't be
         #   changed
         self._load_types()
@@ -126,6 +131,60 @@ class SchemasHub:
     def gui_types(self):
         return self._gui_types
 
+    def get_template_name(self, item_def, default=None):
+        """Get template name from passed item definition.
+
+        Args:
+            item_def(dict): Definition of item with "type".
+            default(object): Default return value.
+        """
+        output = default
+        if not item_def or not isinstance(item_def, dict):
+            return output
+
+        item_type = item_def.get("type")
+        if item_type in ("template", "schema_template"):
+            output = item_def["name"]
+        return output
+
+    def is_dynamic_template_validating(self, template_name):
+        """Is template validating using different entity.
+
+        Returns:
+            bool: Is template validating.
+        """
+        if template_name in self._validating_dynamic:
+            return True
+        return False
+
+    def is_dynamic_template_validated(self, template_name):
+        """Is template already validated.
+
+        Returns:
+            bool: Is template validated.
+        """
+
+        if template_name in self._validated_dynamic:
+            return True
+        return False
+
+    @contextlib.contextmanager
+    def validating_dynamic(self, template_name):
+        """Template name is validating and validated.
+
+        Context manager that cares about storing template name validations of
+        template.
+
+        This is to avoid infinite loop of dynamic children validation.
+        """
+        self._validating_dynamic.add(template_name)
+        try:
+            yield
+            self._validated_dynamic.add(template_name)
+
+        finally:
+            self._validating_dynamic.remove(template_name)
+
     def get_schema(self, schema_name):
         """Get schema definition data by it's name.
 
@@ -147,7 +206,7 @@ class SchemasHub:
                 crashed_item = self._crashed_on_load[schema_name]
                 raise KeyError(
                     "Unable to parse schema file \"{}\". {}".format(
-                        crashed_item["filpath"], crashed_item["message"]
+                        crashed_item["filepath"], crashed_item["message"]
                     )
                 )
 
@@ -176,8 +235,8 @@ class SchemasHub:
             elif template_name in self._crashed_on_load:
                 crashed_item = self._crashed_on_load[template_name]
                 raise KeyError(
-                    "Unable to parse templace file \"{}\". {}".format(
-                        crashed_item["filpath"], crashed_item["message"]
+                    "Unable to parse template file \"{}\". {}".format(
+                        crashed_item["filepath"], crashed_item["message"]
                     )
                 )
 
@@ -345,7 +404,7 @@ class SchemasHub:
                         " One of them crashed on load \"{}\" {}"
                     ).format(
                         filename,
-                        crashed_item["filpath"],
+                        crashed_item["filepath"],
                         crashed_item["message"]
                     ))
 
diff --git a/openpype/settings/entities/list_entity.py b/openpype/settings/entities/list_entity.py
index 4b3f7a2659..b07441251a 100644
--- a/openpype/settings/entities/list_entity.py
+++ b/openpype/settings/entities/list_entity.py
@@ -102,7 +102,9 @@ class ListEntity(EndpointEntity):
 
     def add_new_item(self, idx=None, trigger_change=True):
         child_obj = self._add_new_item(idx)
-        child_obj.set_override_state(self._override_state)
+        child_obj.set_override_state(
+            self._override_state, self._ignore_missing_defaults
+        )
 
         if trigger_change:
             self.on_child_change(child_obj)
@@ -139,7 +141,20 @@ class ListEntity(EndpointEntity):
         item_schema = self.schema_data["object_type"]
         if not isinstance(item_schema, dict):
             item_schema = {"type": item_schema}
-        self.item_schema = item_schema
+
+        obj_template_name = self.schema_hub.get_template_name(item_schema)
+        _item_schemas = self.schema_hub.resolve_schema_data(item_schema)
+        if len(_item_schemas) == 1:
+            self.item_schema = _item_schemas[0]
+            if self.item_schema != item_schema:
+                if "label" in self.item_schema:
+                    self.item_schema.pop("label")
+                self.item_schema["use_label_wrap"] = False
+        else:
+            self.item_schema = _item_schemas
+
+        # Store if was used template or schema
+        self._obj_template_name = obj_template_name
 
         if self.group_item is None:
             self.is_group = True
@@ -148,6 +163,12 @@ class ListEntity(EndpointEntity):
         self.initial_value = []
 
     def schema_validations(self):
+        if isinstance(self.item_schema, list):
+            reason = (
+                "`ListWidget` has multiple items as object type."
+            )
+            raise EntitySchemaError(self, reason)
+
         super(ListEntity, self).schema_validations()
 
         if self.is_dynamic_item and self.use_label_wrap:
@@ -165,18 +186,36 @@ class ListEntity(EndpointEntity):
             raise EntitySchemaError(self, reason)
 
         # Validate object type schema
-        child_validated = False
+        validate_children = True
         for child_entity in self.children:
             child_entity.schema_validations()
-            child_validated = True
+            validate_children = False
             break
 
-        if not child_validated:
+        if validate_children and self._obj_template_name:
+            _validated = self.schema_hub.is_dynamic_template_validated(
+                self._obj_template_name
+            )
+            _validating = self.schema_hub.is_dynamic_template_validating(
+                self._obj_template_name
+            )
+            validate_children = not _validated and not _validating
+
+        if not validate_children:
+            return
+
+        def _validate():
             idx = 0
             tmp_child = self._add_new_item(idx)
             tmp_child.schema_validations()
             self.children.pop(idx)
 
+        if self._obj_template_name:
+            with self.schema_hub.validating_dynamic(self._obj_template_name):
+                _validate()
+        else:
+            _validate()
+
     def get_child_path(self, child_obj):
         result_idx = None
         for idx, _child_obj in enumerate(self.children):
@@ -205,13 +244,14 @@ class ListEntity(EndpointEntity):
             self._has_project_override = True
         self.on_change()
 
-    def set_override_state(self, state):
+    def set_override_state(self, state, ignore_missing_defaults):
         # Trigger override state change of root if is not same
         if self.root_item.override_state is not state:
             self.root_item.set_override_state(state)
             return
 
         self._override_state = state
+        self._ignore_missing_defaults = ignore_missing_defaults
 
         while self.children:
             self.children.pop(0)
@@ -219,11 +259,17 @@ class ListEntity(EndpointEntity):
         # Ignore if is dynamic item and use default in that case
         if not self.is_dynamic_item and not self.is_in_dynamic_item:
             if state > OverrideState.DEFAULTS:
-                if not self.has_default_value:
+                if (
+                    not self.has_default_value
+                    and not ignore_missing_defaults
+                ):
                     raise DefaultsNotDefined(self)
 
             elif state > OverrideState.STUDIO:
-                if not self.had_studio_override:
+                if (
+                    not self.had_studio_override
+                    and not ignore_missing_defaults
+                ):
                     raise StudioDefaultsNotDefined(self)
 
         value = NOT_SET
@@ -257,7 +303,9 @@ class ListEntity(EndpointEntity):
                     child_obj.update_studio_value(item)
 
         for child_obj in self.children:
-            child_obj.set_override_state(self._override_state)
+            child_obj.set_override_state(
+                self._override_state, ignore_missing_defaults
+            )
 
         self.initial_value = self.settings_value()
 
@@ -395,7 +443,9 @@ class ListEntity(EndpointEntity):
                 if self.had_studio_override:
                     child_obj.update_studio_value(item)
 
-            child_obj.set_override_state(self._override_state)
+            child_obj.set_override_state(
+                self._override_state, self._ignore_missing_defaults
+            )
 
         if self._override_state >= OverrideState.PROJECT:
             self._has_project_override = self.had_project_override
@@ -427,7 +477,9 @@ class ListEntity(EndpointEntity):
         for item in value:
             child_obj = self._add_new_item()
             child_obj.update_default_value(item)
-            child_obj.set_override_state(self._override_state)
+            child_obj.set_override_state(
+                self._override_state, self._ignore_missing_defaults
+            )
 
         self._ignore_child_changes = False
 
@@ -460,7 +512,10 @@ class ListEntity(EndpointEntity):
             child_obj.update_default_value(item)
             if self._has_studio_override:
                 child_obj.update_studio_value(item)
-            child_obj.set_override_state(self._override_state)
+            child_obj.set_override_state(
+                self._override_state,
+                self._ignore_missing_defaults
+            )
 
         self._ignore_child_changes = False
 
diff --git a/openpype/settings/entities/root_entities.py b/openpype/settings/entities/root_entities.py
index 5397bf21a1..00677480e8 100644
--- a/openpype/settings/entities/root_entities.py
+++ b/openpype/settings/entities/root_entities.py
@@ -217,7 +217,7 @@ class RootEntity(BaseItemEntity):
             schema_data, *args, **kwargs
         )
 
-    def set_override_state(self, state):
+    def set_override_state(self, state, ignore_missing_defaults=None):
         """Set override state and trigger it on children.
 
         Method will discard all changes in hierarchy and use values, metadata
@@ -226,9 +226,12 @@ class RootEntity(BaseItemEntity):
         Args:
             state (OverrideState): State to which should be data changed.
         """
+        if not ignore_missing_defaults:
+            ignore_missing_defaults = False
+
         self._override_state = state
         for child_obj in self.non_gui_children.values():
-            child_obj.set_override_state(state)
+            child_obj.set_override_state(state, ignore_missing_defaults)
 
     def on_change(self):
         """Trigger callbacks on change."""
diff --git a/openpype/settings/entities/schemas/README.md b/openpype/settings/entities/schemas/README.md
index bbd53fa46b..2034d4e463 100644
--- a/openpype/settings/entities/schemas/README.md
+++ b/openpype/settings/entities/schemas/README.md
@@ -181,6 +181,106 @@
 }
 ```
 
+## dict-conditional
+- is similar to `dict` but has only one child entity that will be always available
+- the one entity is enumerator of possible values and based on value of the entity are defined and used other children entities
+- each value of enumerator have defined children that will be used
+    - there is no way how to have shared entities across multiple enum items
+- value from enumerator is also stored next to other values
+    - to define the key under which will be enum value stored use `enum_key`
+    - `enum_key` must match key regex and any enum item can't have children with same key
+    - `enum_label` is label of the entity for UI purposes
+- enum items are define with `enum_children`
+    - it's a list where each item represents enum item
+    - all items in `enum_children` must have at least `key` key which represents value stored under `enum_key`
+    - items can define `label` for UI purposes
+    - most important part is that item can define `children` key where are definitions of it's children (`children` value works the same way as in `dict`)
+- to set default value for `enum_key` set it with `enum_default`
+- entity must have defined `"label"` if is not used as widget
+- is set as group if any parent is not group
+- if `"label"` is entetered there which will be shown in GUI
+    - item with label can be collapsible
+        - that can be set with key `"collapsible"` as `True`/`False` (Default: `True`)
+            - with key `"collapsed"` as `True`/`False` can be set that is collapsed when GUI is opened (Default: `False`)
+    - it is possible to add darker background with `"highlight_content"` (Default: `False`)
+        - darker background has limits of maximum applies after 3-4 nested highlighted items there is not difference in the color
+    - output is dictionary `{the "key": children values}`
+- for UI porposes was added `enum_is_horizontal` which will make combobox appear next to children inputs instead of on top of them (Default: `False`)
+    - this has extended ability of `enum_on_right` which will move combobox to right side next to children widgets (Default: `False`)
+```
+# Example
+{
+    "type": "dict-conditional",
+    "key": "my_key",
+    "label": "My Key",
+    "enum_key": "type",
+    "enum_label": "label",
+    "enum_children": [
+        # Each item must be a dictionary with 'key'
+        {
+            "key": "action",
+            "label": "Action",
+            "children": [
+                {
+                    "type": "text",
+                    "key": "key",
+                    "label": "Key"
+                },
+                {
+                    "type": "text",
+                    "key": "label",
+                    "label": "Label"
+                },
+                {
+                    "type": "text",
+                    "key": "command",
+                    "label": "Comand"
+                }
+            ]
+        },
+        {
+            "key": "menu",
+            "label": "Menu",
+            "children": [
+                {
+                    "key": "children",
+                    "label": "Children",
+                    "type": "list",
+                    "object_type": "text"
+                }
+            ]
+        },
+        {
+            # Separator does not have children as "separator" value is enough
+            "key": "separator",
+            "label": "Separator"
+        }
+    ]
+}
+```
+
+How output of the schema could look like on save:
+```
+{
+    "type": "separator"
+}
+
+{
+    "type": "action",
+    "key": "action_1",
+    "label": "Action 1",
+    "command": "run command -arg"
+}
+
+{
+    "type": "menu",
+    "children": [
+        "child_1",
+        "child_2"
+    ]
+}
+```
+
 ## Inputs for setting any kind of value (`Pure` inputs)
 - all these input must have defined `"key"` under which will be stored and `"label"` which will be shown next to input
     - unless they are used in different types of inputs (later) "as widgets" in that case `"key"` and `"label"` are not required as there is not place where to set them
@@ -240,6 +340,11 @@
 - schema also defines valid value type
     - by default it is dictionary
     - to be able use list it is required to define `is_list` to `true`
+- output can be stored as string
+    - this is to allow any keys in dictionary
+    - set key `store_as_string` to `true`
+    - code using that setting must expected that value is string and use json module to convert it to python types
+
 ```
 {
     "type": "raw-json",
@@ -255,6 +360,9 @@
 - values are defined under value of key `"enum_items"` as list
     - each item in list is simple dictionary where value is label and key is value which will be stored
     - should be possible to enter single dictionary if order of items doesn't matter
+- it is possible to set default selected value/s with `default` attribute
+    - it is recommended to use this option only in single selection mode
+    - at the end this option is used only when defying default settings value or in dynamic items
 
 ```
 {
@@ -267,7 +375,7 @@
         {"ftrackreview": "Add to Ftrack"},
         {"delete": "Delete output"},
         {"slate-frame": "Add slate frame"},
-        {"no-hnadles": "Skip handle frames"}
+        {"no-handles": "Skip handle frames"}
     ]
 }
 ```
@@ -277,6 +385,9 @@
 - multiselection can be allowed with setting key `"multiselection"` to `True` (Default: `False`)
 - it is possible to add empty value (represented with empty string) with setting `"use_empty_value"` to `True` (Default: `False`)
 - it is possible to set `"custom_labels"` for host names where key `""` is empty value (Default: `{}`)
+- to filter host names it is required to define `"hosts_filter"` which is list of host names that will be available
+    - do not pass empty string if `use_empty_value` is enabled
+    - ignoring host names would be more dangerous in some cases
 ```
 {
     "key": "host",
@@ -287,7 +398,10 @@
     "custom_labels": {
         "": "N/A",
         "nuke": "Nuke"
-    }
+    },
+    "hosts_filter": [
+        "nuke"
+    ]
 }
 ```
 
@@ -307,6 +421,8 @@
 - there are 2 possible ways how to set the type:
     1.) dictionary with item modifiers (`number` input has `minimum`, `maximum` and `decimals`) in that case item type must be set as value of `"type"` (example below)
     2.) item type name as string without modifiers (e.g. `text`)
+    3.) enhancement of 1.) there is also support of `template` type but be carefull about endless loop of templates
+        - goal of using `template` is to easily change same item definitions in multiple lists
 
 1.) with item modifiers
 ```
@@ -332,6 +448,65 @@
 }
 ```
 
+3.) with template definition
+```
+# Schema of list item where template is used
+{
+    "type": "list",
+    "key": "menu_items",
+    "label": "Menu Items",
+    "object_type": {
+        "type": "template",
+        "name": "template_object_example"
+    }
+}
+
+# WARNING:
+#  In this example the template use itself inside which will work in `list`
+#  but may cause an issue in other entity types (e.g. `dict`).
+
+'template_object_example.json' :
+[
+    {
+        "type": "dict-conditional",
+        "use_label_wrap": true,
+        "collapsible": true,
+        "key": "menu_items",
+        "label": "Menu items",
+        "enum_key": "type",
+        "enum_label": "Type",
+        "enum_children": [
+            {
+                "key": "action",
+                "label": "Action",
+                "children": [
+                    {
+                        "type": "text",
+                        "key": "key",
+                        "label": "Key"
+                    }
+                ]
+            },
+            {
+                "key": "menu",
+                "label": "Menu",
+                "children": [
+                    {
+                        "key": "children",
+                        "label": "Children",
+                        "type": "list",
+                        "object_type": {
+                            "type": "template",
+                            "name": "template_object_example"
+                        }
+                    }
+                ]
+            }
+        ]
+    }
+]
+```
+
 ### dict-modifiable
 - one of dictionary inputs, this is only used as value input
 - items in this input can be removed and added same way as in `list` input
@@ -475,6 +650,15 @@
 }
 ```
 
+## Anatomy
+Anatomy represents data stored on project document.
+
+### anatomy
+- entity works similarly to `dict`
+- anatomy has always all keys overriden with overrides
+    - overrides are not applied as all anatomy data must be available from project document
+    - all children must be groups
+
 ## Proxy wrappers
 - should wraps multiple inputs only visually
 - these does not have `"key"` key and do not allow to have `"is_file"` or `"is_group"` modifiers enabled
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index f6a8127951..53c6bf48c0 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -52,11 +52,106 @@
                         }
                     ]
                 },
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "key": "ProcessSubmittedJobOnFarm",
+                    "label": "ProcessSubmittedJobOnFarm",
+                    "checkbox_key": "enabled",
+                    "is_group": true,
+                    "children": [
+                        {
+                            "type": "boolean",
+                            "key": "enabled",
+                            "label": "Enabled"
+                        },
+                        {
+                            "type": "text",
+                            "key": "deadline_department",
+                            "label": "Deadline department"
+                        },
+                        {
+                            "type": "text",
+                            "key": "deadline_pool",
+                            "label": "Deadline Pool"
+                        },
+                        {
+                            "type": "text",
+                            "key": "deadline_group",
+                            "label": "Deadline Group"
+                        },
+                        {
+                            "type": "number",
+                            "key": "deadline_chunk_size",
+                            "label": "Deadline Chunk Size"
+                        },
+                        {
+                            "type": "number",
+                            "key": "deadline_priority",
+                            "label": "Deadline Priotity"
+                        },
+                        {
+                            "type": "splitter"
+                        },
+                        {
+                            "type": "text",
+                            "key": "publishing_script",
+                            "label": "Publishing script path"
+                        },
+                        {
+                            "type": "list",
+                            "key": "skip_integration_repre_list",
+                            "label": "Skip integration of representation with ext",
+                            "object_type": {
+                                "type": "text"
+                            }
+                        },
+                        {
+                            "type": "dict",
+                            "key": "aov_filter",
+                            "label": "Reviewable subsets filter",
+                            "children": [
+                                {
+                                    "type": "list",
+                                    "key": "maya",
+                                    "label": "Maya",
+                                    "object_type": {
+                                        "type": "text"
+                                    }
+                                },
+                                {
+                                    "type": "list",
+                                    "key": "nuke",
+                                    "label": "Nuke",
+                                    "object_type": {
+                                        "type": "text"
+                                    }
+                                },
+                                {
+                                    "type": "list",
+                                    "key": "aftereffects",
+                                    "label": "After Effects",
+                                    "object_type": {
+                                        "type": "text"
+                                    }
+                                },
+                                {
+                                    "type": "list",
+                                    "key": "celaction",
+                                    "label": "Celaction",
+                                    "object_type": {
+                                        "type": "text"
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                },
                 {
                     "type": "dict",
                     "collapsible": true,
                     "key": "MayaSubmitDeadline",
-                    "label": "Submit maya job to deadline",
+                    "label": "Submit Maya job to Deadline",
                     "checkbox_key": "enabled",
                     "children": [
                         {
@@ -108,6 +203,41 @@
                             "key": "limit",
                             "label": "Limit Groups",
                             "object_type": "text"
+                        },
+                        {
+                            "type": "raw-json",
+                            "key": "jobInfo",
+                            "label": "Additional JobInfo data"
+                        },
+                        {
+                            "type": "raw-json",
+                            "key": "pluginInfo",
+                            "label": "Additional PluginInfo data"
+                        },
+                        {
+                            "type": "list",
+                            "key": "scene_patches",
+                            "label": "Scene patches",
+                            "required_keys": ["name", "regex", "line"],
+                            "object_type": {
+                                "type": "dict",
+                                "children": [
+                                    {
+                                        "key": "name",
+                                        "label": "Patch name",
+                                        "type": "text"
+                                    }, {
+                                        "key": "regex",
+                                        "label": "Patch regex",
+                                        "type": "text"
+                                    }, {
+                                        "key": "line",
+                                        "label": "Patch line",
+                                        "type": "text"
+                                    }
+                                ]
+
+                            }
                         }
                     ]
                 },
@@ -173,6 +303,20 @@
                             "key": "use_gpu",
                             "label": "Use GPU"
                         },
+                        {
+                            "type": "list",
+                            "key": "env_allowed_keys",
+                            "object_type": "text",
+                            "label": "Allowed environment keys"
+                        },
+                        {
+                            "type": "dict-modifiable",
+                            "key": "env_search_replace_values",
+                            "label": "Search & replace in environment values",
+                            "object_type": {
+                                "type": "text"
+                            }
+                        },
                         {
                             "type": "dict-modifiable",
                             "key": "limit_groups",
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
index a94ebc8888..1cc08b96f8 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
@@ -441,6 +441,18 @@
                             "key": "role_list",
                             "label": "Roles",
                             "object_type": "text"
+                        },
+                        {
+                          "type": "separator"
+                        },
+                        {
+                          "type": "label",
+                          "label": "Check \"Create project structure\" by default"
+                        },
+                        {
+                            "type": "boolean",
+                            "key": "create_project_structure_checked",
+                            "label": "Checked"
                         }
                     ]
                 },
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_global.json b/openpype/settings/entities/schemas/projects_schema/schema_project_global.json
index 6e5cf0671c..a8bce47592 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_global.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_global.json
@@ -17,7 +17,8 @@
             "type": "raw-json",
             "label": "Project Folder Structure",
             "key": "project_folder_structure",
-            "use_label_wrap": true
+            "use_label_wrap": true,
+            "store_as_string": true
         },
         {
             "type": "schema",
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
index 0a59cab510..cc70516c72 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
@@ -14,6 +14,43 @@
                                 "type": "text"
                             }
         },
+        {
+           "type": "dict",
+            "collapsible": true,
+            "checkbox_key": "enabled",
+            "key": "maya-dirmap",
+            "label": "Maya Directory Mapping",
+            "is_group": true,
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                },
+                {
+                    "type": "dict",
+                    "key": "paths",
+                    "children": [
+                        {
+                            "type": "list",
+                            "object_type": "text",
+                            "key": "source-path",
+                            "label": "Source Path"
+                        },
+                        {
+                            "type": "list",
+                            "object_type": "text",
+                            "key": "destination-path",
+                            "label": "Destination Path"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "type": "schema",
+            "name": "schema_maya_scriptsmenu"
+        },
         {
             "type": "schema",
             "name": "schema_maya_create"
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json b/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json
index 01a954f283..e0b21f4037 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json
@@ -63,6 +63,14 @@
                             "type": "text",
                             "key": "fpath_template",
                             "label": "Path template"
+                        },
+                        {
+                            "type": "list",
+                            "key": "defaults",
+                            "label": "Subset name defaults",
+                            "object_type": {
+                                "type": "text"
+                            }
                         }
                     ]
                 },
@@ -82,6 +90,14 @@
                             "type": "boolean",
                             "key": "use_range_limit",
                             "label": "Use Frame range limit by default"
+                        },
+                        {
+                            "type": "list",
+                            "key": "defaults",
+                            "label": "Subset name defaults",
+                            "object_type": {
+                                "type": "text"
+                            }
                         }
                     ]
                 }
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_standalonepublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_standalonepublisher.json
index 0ef7612805..37fcaac69f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_standalonepublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_standalonepublisher.json
@@ -56,6 +56,119 @@
             "key": "publish",
             "label": "Publish plugins",
             "children": [
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "key": "CollectTextures",
+                    "label": "Collect Textures",
+                    "checkbox_key": "enabled",
+                    "children": [
+                        {
+                            "type": "boolean",
+                            "key": "enabled",
+                            "label": "Enabled"
+                        },
+                        {
+                            "type": "boolean",
+                            "key": "active",
+                            "label": "Active"
+                        },
+                        {
+                            "type": "list",
+                            "key": "main_workfile_extensions",
+                            "object_type": "text",
+                            "label": "Main workfile extensions"
+                        },
+                        {
+                            "key": "other_workfile_extensions",
+                            "label": "Support workfile extensions",
+                            "type": "list",
+                            "object_type": "text"
+                        },
+                        {
+                            "type": "list",
+                            "key": "texture_extensions",
+                            "object_type": "text",
+                            "label": "Texture extensions"
+                        },
+                        {
+                            "type": "list",
+                            "key": "workfile_families",
+                            "object_type": "text",
+                            "label": "Additional families for workfile"
+                        },
+                        {
+                            "type": "list",
+                            "key": "texture_families",
+                            "object_type": "text",
+                            "label": "Additional families for textures"
+                        },
+                        {
+                            "type": "list",
+                            "key": "color_space",
+                            "object_type": "text",
+                            "label": "Color spaces"
+                        },
+                        {
+                            "type": "dict",
+                            "collapsible": false,
+                            "key": "input_naming_patterns",
+                            "label": "Regex patterns for naming conventions",
+                            "children": [
+                                {
+                                    "type": "label",
+                                    "label": "Add regex groups matching expected name"
+                                },
+                                {
+                                    "type": "list",
+                                    "object_type": "text",
+                                    "key": "workfile",
+                                    "label": "Workfile naming pattern"
+                                },
+                                {
+                                    "type": "list",
+                                    "object_type": "text",
+                                    "key": "textures",
+                                    "label": "Textures naming pattern"
+                                }
+                            ]
+                        },
+                        {
+                            "type": "dict",
+                            "collapsible": false,
+                            "key": "input_naming_groups",
+                            "label": "Group order for regex patterns",
+                            "children": [
+                                {
+                                    "type": "label",
+                                    "label": "Add names of matched groups in correct order. Available values: ('filler', 'asset', 'shader', 'version', 'channel', 'color_space', 'udim')"
+                                },
+                                {
+                                    "type": "list",
+                                    "object_type": "text",
+                                    "key": "workfile",
+                                    "label": "Workfile group positions"
+                                },
+                                {
+                                    "type": "list",
+                                    "object_type": "text",
+                                    "key": "textures",
+                                    "label": "Textures group positions"
+                                }
+                            ]
+                        },
+                        {
+                            "type": "text",
+                            "key": "workfile_subset_template",
+                            "label": "Subset name template for workfile"
+                        },
+                        {
+                            "type": "text",
+                            "key": "texture_subset_template",
+                            "label": "Subset name template for textures"
+                        }
+                    ]
+                },
                {
                     "type": "dict",
                     "collapsible": true,
@@ -130,6 +243,165 @@
                             ]
                         }
                     ]
+                },
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "key": "CollectEditorial",
+                    "label": "Collect Editorial",
+                    "is_group": true,
+                    "children": [
+                        {
+                            "type": "text",
+                            "key": "source_dir",
+                            "label": "Editorial resources pointer"
+                        },
+                        {
+                            "type": "list",
+                            "key": "extensions",
+                            "label": "Accepted extensions",
+                            "object_type": "text"
+                        }
+                    ]
+                },
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "key": "CollectHierarchyInstance",
+                    "label": "Collect Instance Hierarchy",
+                    "is_group": true,
+                    "children": [
+                        {
+                            "type": "text",
+                            "key": "shot_rename_template",
+                            "label": "Shot rename template"
+                        },
+                        {
+                            "key": "shot_rename_search_patterns",
+                            "label": "Shot renaming paterns search",
+                            "type": "dict-modifiable",
+                            "highlight_content": true,
+                            "object_type": {
+                                "type": "text"
+                            }
+                        },
+                        {
+                            "type": "dict",
+                            "key": "shot_add_hierarchy",
+                            "label": "Shot hierarchy",
+                            "children": [
+                                {
+                                    "type": "text",
+                                    "key": "parents_path",
+                                    "label": "Parents path template"
+                                },
+                                {
+                                    "key": "parents",
+                                    "label": "Parents",
+                                    "type": "dict-modifiable",
+                                    "highlight_content": true,
+                                    "object_type": {
+                                        "type": "text"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "key": "shot_add_tasks",
+                            "label": "Add tasks to shot",
+                            "type": "dict-modifiable",
+                            "highlight_content": true,
+                            "object_type": {
+                                "type": "dict",
+                                "children": [
+                                    {
+                                        "type": "task-types-enum",
+                                        "key": "type",
+                                        "label": "Task type"
+                                    }
+                                ]
+                            }
+                        }
+                    ]
+                },
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "key": "CollectInstances",
+                    "label": "Collect Clip Instances",
+                    "is_group": true,
+                    "children": [
+                        {
+                            "type": "number",
+                            "key": "custom_start_frame",
+                            "label": "Custom start frame",
+                            "default": 0,
+                            "minimum": 1,
+                            "maximum": 100000
+                        },
+                        {
+                            "type": "number",
+                            "key": "timeline_frame_start",
+                            "label": "Timeline start frame",
+                            "default": 900000,
+                            "minimum": 1,
+                            "maximum": 10000000
+                        },
+                        {
+                            "type": "number",
+                            "key": "timeline_frame_offset",
+                            "label": "Timeline frame offset",
+                            "default": 0,
+                            "minimum": -1000000,
+                            "maximum": 1000000
+                        },
+                        {
+                            "key": "subsets",
+                            "label": "Subsets",
+                            "type": "dict-modifiable",
+                            "highlight_content": true,
+                            "object_type": {
+                                "type": "dict",
+                                "children": [
+                                    {
+                                        "type": "text",
+                                        "key": "family",
+                                        "label": "Family"
+                                    },
+                                    {
+                                        "type": "list",
+                                        "key": "families",
+                                        "label": "Families",
+                                        "object_type": "text"
+                                    },
+                                    {
+                                        "type": "splitter"
+                                    },
+                                    {
+                                        "type": "list",
+                                        "key": "extensions",
+                                        "label": "Extensions",
+                                        "object_type": "text"
+                                    },
+                                    {
+                                        "key": "version",
+                                        "label": "Version lock",
+                                        "type": "number",
+                                        "default": 0,
+                                        "minimum": 0,
+                                        "maximum": 10
+                                    }
+                                    ,
+                                    {
+                                        "type": "boolean",
+                                        "key": "keepSequence",
+                                        "label": "Keep sequence if used for review",
+                                        "default": false
+                                    }
+                                ]
+                            }
+                        }
+                    ]
                 }
             ]
         }
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json
index 67aa4b0a06..368141813f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json
@@ -52,6 +52,17 @@
                         }
                     ]
                 },
+                {
+                  "type": "schema_template",
+                  "name": "template_publish_plugin",
+                  "template_data": [
+                      {
+                          "key": "ValidateStartFrame",
+                          "label": "Validate Scene Start Frame",
+                          "docstring": "Validate first frame of scene is set to '0'."
+                      }
+                  ]
+                },
                 {
                     "type": "schema_template",
                     "name": "template_publish_plugin",
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_unreal.json b/openpype/settings/entities/schemas/projects_schema/schema_project_unreal.json
index b6e94d9d03..4e197e9fc8 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_unreal.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_unreal.json
@@ -15,11 +15,6 @@
                     "type": "boolean",
                     "key": "dev_mode",
                     "label": "Dev mode"
-                },
-                {
-                    "type": "boolean",
-                    "key": "install_unreal_python_engine",
-                    "label": "Install unreal python engine"
                 }
             ]
         }
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_imageio.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_imageio.json
index 2b2eab8868..3c589f9492 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_imageio.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_anatomy_imageio.json
@@ -3,6 +3,7 @@
     "key": "imageio",
     "label": "Color Management and Output Formats",
     "is_file": true,
+    "is_group": true,
     "children": [
         {
             "key": "hiero",
@@ -14,7 +15,6 @@
                     "type": "dict",
                     "label": "Workfile",
                     "collapsible": false,
-                    "is_group": true,
                     "children": [
                         {
                             "type": "form",
@@ -89,7 +89,6 @@
                     "type": "dict",
                     "label": "Colorspace on Inputs by regex detection",
                     "collapsible": true,
-                    "is_group": true,
                     "children": [
                         {
                             "type": "list",
@@ -124,7 +123,6 @@
                     "type": "dict",
                     "label": "Viewer",
                     "collapsible": false,
-                    "is_group": true,
                     "children": [
                         {
                             "type": "text",
@@ -138,7 +136,6 @@
                     "type": "dict",
                     "label": "Workfile",
                     "collapsible": false,
-                    "is_group": true,
                     "children": [
                         {
                             "type": "form",
@@ -236,7 +233,6 @@
                     "type": "dict",
                     "label": "Nodes",
                     "collapsible": true,
-                    "is_group": true,
                     "children": [
                         {
                             "key": "requiredNodes",
@@ -339,7 +335,6 @@
                     "type": "dict",
                     "label": "Colorspace on Inputs by regex detection",
                     "collapsible": true,
-                    "is_group": true,
                     "children": [
                         {
                             "type": "list",
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
index 496635287f..d265988534 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
@@ -4,6 +4,46 @@
     "key": "publish",
     "label": "Publish plugins",
     "children": [
+        {
+            "type": "dict",
+            "collapsible": true,
+            "checkbox_key": "enabled",
+            "key": "ValidateEditorialAssetName",
+            "label": "Validate Editorial Asset Name",
+            "is_group": true,
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                },
+                {
+                    "type": "boolean",
+                    "key": "optional",
+                    "label": "Optional"
+                }
+            ]
+        },
+        {
+            "type": "dict",
+            "collapsible": true,
+            "checkbox_key": "enabled",
+            "key": "ValidateVersion",
+            "label": "Validate Version",
+            "is_group": true,
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                },
+                {
+                    "type": "boolean",
+                    "key": "optional",
+                    "label": "Optional"
+                }
+            ]
+        },
         {
             "type": "dict",
             "collapsible": true,
@@ -519,80 +559,25 @@
         {
             "type": "dict",
             "collapsible": true,
-            "key": "ProcessSubmittedJobOnFarm",
-            "label": "ProcessSubmittedJobOnFarm",
-            "checkbox_key": "enabled",
+            "key": "CleanUp",
+            "label": "Clean Up",
             "is_group": true,
             "children": [
+                {
+                    "type": "list",
+                    "key": "paterns",
+                    "label": "Paterrns (regex)",
+                    "object_type": {
+                        "type": "text"
+                    }
+                },
                 {
                     "type": "boolean",
-                    "key": "enabled",
-                    "label": "Enabled"
-                },
-                {
-                    "type": "text",
-                    "key": "deadline_department",
-                    "label": "Deadline department"
-                },
-                {
-                    "type": "text",
-                    "key": "deadline_pool",
-                    "label": "Deadline Pool"
-                },
-                {
-                    "type": "text",
-                    "key": "deadline_group",
-                    "label": "Deadline Group"
-                },
-                {
-                    "type": "number",
-                    "key": "deadline_chunk_size",
-                    "label": "Deadline Chunk Size"
-                },
-                {
-                    "type": "number",
-                    "key": "deadline_priority",
-                    "label": "Deadline Priotity"
-                },
-                {
-                    "type": "dict",
-                    "key": "aov_filter",
-                    "label": "Reviewable subsets filter",
-                    "children": [
-                        {
-                            "type": "list",
-                            "key": "maya",
-                            "label": "Maya",
-                            "object_type": {
-                                "type": "text"
-                            }
-                        },
-                        {
-                            "type": "list",
-                            "key": "nuke",
-                            "label": "Nuke",
-                            "object_type": {
-                                "type": "text"
-                            }
-                        },
-                        {
-                            "type": "list",
-                            "key": "aftereffects",
-                            "label": "After Effects",
-                            "object_type": {
-                                "type": "text"
-                            }
-                        },
-                        {
-                            "type": "list",
-                            "key": "celaction",
-                            "label": "Celaction",
-                            "object_type": {
-                                "type": "text"
-                            }
-                        }
-                    ]
+                    "key": "remove_temp_renders",
+                    "label": "Remove Temp renders",
+                    "default": false
                 }
+
             ]
         }
     ]
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json
index 8c92a45a56..9e39eeb39e 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_tools.json
@@ -78,7 +78,57 @@
                                 "type": "hosts-enum",
                                 "key": "hosts",
                                 "label": "Hosts",
-                                "multiselection": true
+                                "multiselection": true,
+                                "hosts_filter": [
+                                      "aftereffects",
+                                      "blender",
+                                      "celaction",
+                                      "fusion",
+                                      "harmony",
+                                      "hiero",
+                                      "houdini",
+                                      "maya",
+                                      "nuke",
+                                      "photoshop",
+                                      "resolve",
+                                      "tvpaint",
+                                      "unreal"
+                                  ]
+                            },
+                            {
+                                "key": "tasks",
+                                "label": "Tasks",
+                                "type": "list",
+                                "object_type": "text"
+                            },
+                            {
+                                "type": "splitter"
+                            },
+                            {
+                                "type": "boolean",
+                                "key": "enabled",
+                                "label": "Enabled"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "type": "list",
+                    "key": "open_workfile_tool_on_startup",
+                    "label": "Open workfile tool on launch",
+                    "is_group": true,
+                    "use_label_wrap": true,
+                    "object_type": {
+                        "type": "dict",
+                        "children": [
+                            {
+                                "type": "hosts-enum",
+                                "key": "hosts",
+                                "label": "Hosts",
+                                "multiselection": true,
+                                "hosts_filter": [
+                                    "nuke"
+                                ]
                             },
                             {
                                 "key": "tasks",
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
index 5ca7059ee5..89cd30aed0 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
@@ -147,9 +147,14 @@
                             "key": "enabled",
                             "label": "Enabled"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "database",
+                            "label": "Use database shader name definitions"
+                        },
                         {
                             "type": "label",
-                            "label": "Path to material file defining list of material names to check. This is material name per line simple text file.<br/>It will be checked against named group <b>shader</b> in your <em>Validation regex</em>.<p>For example: <br/> <code>^.*(?P=&lt;shader&gt;.+)_GEO</code></p>"
+                            "label": "Path to material file defining list of material names to check. This is material name per line simple text file.<br/>It will be checked against named group <b>shader</b> in your <em>Validation regex</em>.<p>For example: <br/> <code>^.*(?P=&lt;shader&gt;.+)_GEO</code></p>This is used instead of database definitions if they are disabled."
                         },
                         {
                             "type": "path",
@@ -162,6 +167,15 @@
                             "type": "text",
                             "key": "regex",
                             "label": "Validation regex"
+                        },
+                        {
+                            "type": "label",
+                            "label": "Regex for validating name of top level group name.<br/>You can use named capturing groups:<br/><code>(?P&lt;asset&gt;.*)</code> for Asset name<br/><code>(?P&lt;subset&gt;.*)</code> for Subset<br/><code>(?P&lt;project&gt;.*)</code> for project<br/><p>For example to check for asset in name so <code>*_some_asset_name_GRP</code> is valid, use:<br/><code>.*?_(?P&lt;asset&gt;.*)_GEO</code>"
+                        },
+                        {
+                            "type": "text",
+                            "key": "top_level_regex",
+                            "label": "Top level group name regex"
                         }
                     ]
                 },
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_scriptsmenu.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_scriptsmenu.json
new file mode 100644
index 0000000000..e841d6ba77
--- /dev/null
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_scriptsmenu.json
@@ -0,0 +1,22 @@
+{
+  "type": "dict",
+  "collapsible": true,
+  "key": "scriptsmenu",
+  "label": "Scripts Menu Definition",
+  "children": [
+    {
+      "type": "text",
+      "key": "name",
+      "label": "Menu Name"
+    },
+    {
+      "type": "splitter"
+    },
+    {
+      "type": "raw-json",
+      "key": "definition",
+      "label": "Menu definition",
+      "is_list": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openpype/settings/entities/schemas/system_schema/example_infinite_hierarchy.json b/openpype/settings/entities/schemas/system_schema/example_infinite_hierarchy.json
new file mode 100644
index 0000000000..a2660e9bf2
--- /dev/null
+++ b/openpype/settings/entities/schemas/system_schema/example_infinite_hierarchy.json
@@ -0,0 +1,58 @@
+[
+    {
+        "type": "dict-conditional",
+        "use_label_wrap": true,
+        "collapsible": true,
+        "key": "menu_items",
+        "label": "Menu items",
+        "enum_key": "type",
+        "enum_label": "Type",
+        "enum_children": [
+            {
+                "key": "action",
+                "label": "Action",
+                "children": [
+                    {
+                        "type": "text",
+                        "key": "key",
+                        "label": "Key"
+                    },
+                    {
+                        "type": "text",
+                        "key": "label",
+                        "label": "Label"
+                    },
+                    {
+                        "type": "text",
+                        "key": "command",
+                        "label": "Comand"
+                    }
+                ]
+            },
+            {
+                "key": "menu",
+                "label": "Menu",
+                "children": [
+                    {
+                        "type": "text",
+                        "key": "label",
+                        "label": "Label"
+                    },
+                    {
+                        "key": "children",
+                        "label": "Children",
+                        "type": "list",
+                        "object_type": {
+                            "type": "template",
+                            "name": "example_infinite_hierarchy"
+                        }
+                    }
+                ]
+            },
+            {
+                "key": "separator",
+                "label": "Separator"
+            }
+        ]
+    }
+]
diff --git a/openpype/settings/entities/schemas/system_schema/example_schema.json b/openpype/settings/entities/schemas/system_schema/example_schema.json
index a4ed56df32..f633d5cb1a 100644
--- a/openpype/settings/entities/schemas/system_schema/example_schema.json
+++ b/openpype/settings/entities/schemas/system_schema/example_schema.json
@@ -9,6 +9,90 @@
             "label": "Color input",
             "type": "color"
         },
+        {
+            "type": "dict-conditional",
+            "key": "overriden_value",
+            "label": "Overriden value",
+            "enum_key": "overriden",
+            "enum_is_horizontal": true,
+            "enum_children": [
+                {
+                    "key": "overriden",
+                    "label": "Override value",
+                    "children": [
+                        {
+                            "type": "number",
+                            "key": "value",
+                            "label": "value"
+                        }
+                    ]
+                },
+                {
+                    "key": "inherit",
+                    "label": "Inherit value",
+                    "children": []
+                }
+            ]
+        },
+        {
+            "type": "dict-conditional",
+            "use_label_wrap": true,
+            "collapsible": true,
+            "key": "menu_items",
+            "label": "Menu items",
+            "enum_key": "type",
+            "enum_label": "Type",
+            "enum_children": [
+                {
+                    "key": "action",
+                    "label": "Action",
+                    "children": [
+                        {
+                            "type": "text",
+                            "key": "key",
+                            "label": "Key"
+                        },
+                        {
+                            "type": "text",
+                            "key": "label",
+                            "label": "Label"
+                        },
+                        {
+                            "type": "text",
+                            "key": "command",
+                            "label": "Comand"
+                        }
+                    ]
+                },
+                {
+                    "key": "menu",
+                    "label": "Menu",
+                    "children": [
+                        {
+                            "key": "children",
+                            "label": "Children",
+                            "type": "list",
+                            "object_type": "text"
+                        }
+                    ]
+                },
+                {
+                    "key": "separator",
+                    "label": "Separator"
+                }
+            ]
+        },
+        {
+            "type": "list",
+            "use_label_wrap": true,
+            "collapsible": true,
+            "key": "infinite_hierarchy",
+            "label": "Infinite list template hierarchy",
+            "object_type": {
+                "type": "template",
+                "name": "example_infinite_hierarchy"
+            }
+        },
         {
             "type": "dict",
             "key": "schema_template_exaples",
diff --git a/openpype/settings/lib.py b/openpype/settings/lib.py
index 4a3e66de33..5c2c0dcd94 100644
--- a/openpype/settings/lib.py
+++ b/openpype/settings/lib.py
@@ -315,14 +315,28 @@ class DuplicatedEnvGroups(Exception):
         super(DuplicatedEnvGroups, self).__init__(msg)
 
 
+def load_openpype_default_settings():
+    """Load openpype default settings."""
+    return load_jsons_from_dir(DEFAULTS_DIR)
+
+
 def reset_default_settings():
+    """Reset cache of default settings. Can't be used now."""
     global _DEFAULT_SETTINGS
     _DEFAULT_SETTINGS = None
 
 
 def get_default_settings():
+    """Get default settings.
+
+    Todo:
+        Cache loaded defaults.
+
+    Returns:
+        dict: Loaded default settings.
+    """
     # TODO add cacher
-    return load_jsons_from_dir(DEFAULTS_DIR)
+    return load_openpype_default_settings()
     # global _DEFAULT_SETTINGS
     # if _DEFAULT_SETTINGS is None:
     #     _DEFAULT_SETTINGS = load_jsons_from_dir(DEFAULTS_DIR)
@@ -868,6 +882,25 @@ def get_environments():
     return find_environments(get_system_settings(False))
 
 
+def get_general_environments():
+    """Get general environments.
+
+    Function is implemented to be able load general environments without using
+    `get_default_settings`.
+    """
+    # Use only openpype defaults.
+    # - prevent to use `get_system_settings` where `get_default_settings`
+    #   is used
+    default_values = load_openpype_default_settings()
+    studio_overrides = get_studio_system_settings_overrides()
+    result = apply_overrides(default_values, studio_overrides)
+    environments = result["general"]["environment"]
+
+    clear_metadata_from_settings(environments)
+
+    return environments
+
+
 def clear_metadata_from_settings(values):
     """Remove all metadata keys from loaded settings."""
     if isinstance(values, dict):
diff --git a/openpype/style/style.css b/openpype/style/style.css
index da7335d5c4..6997c73f27 100644
--- a/openpype/style/style.css
+++ b/openpype/style/style.css
@@ -35,6 +35,10 @@ QWidget:disabled {
     color: {color:font-disabled};
 }
 
+QLabel {
+    background: transparent;
+}
+
 /* Inputs */
 QAbstractSpinBox, QLineEdit, QPlainTextEdit, QTextEdit {
     border: 1px solid {color:border};
@@ -97,7 +101,7 @@ QToolButton:disabled {
     background: {color:bg-buttons-disabled};
 }
 
-QToolButton[popupMode="1"] {
+QToolButton[popupMode="1"], QToolButton[popupMode="MenuButtonPopup"] {
     /* make way for the popup button */
     padding-right: 20px;
     border: 1px solid {color:bg-buttons};
@@ -340,6 +344,11 @@ QAbstractItemView {
     selection-background-color: transparent;
 }
 
+QAbstractItemView::item {
+    /* `border: none` hide outline of selected item. */
+    border: none;
+}
+
 QAbstractItemView:disabled{
     background: {color:bg-view-disabled};
     alternate-background-color: {color:bg-view-alternate-disabled};
diff --git a/openpype/tools/pyblish_pype/control.py b/openpype/tools/pyblish_pype/control.py
index ae9ca40be5..234135fd9a 100644
--- a/openpype/tools/pyblish_pype/control.py
+++ b/openpype/tools/pyblish_pype/control.py
@@ -316,6 +316,7 @@ class Controller(QtCore.QObject):
                 self.was_skipped.emit(plugin)
                 continue
 
+            in_collect_stage = self.collect_state == 0
             if plugin.__instanceEnabled__:
                 instances = pyblish.logic.instances_by_plugin(
                     self.context, plugin
@@ -325,7 +326,10 @@ class Controller(QtCore.QObject):
                     continue
 
                 for instance in instances:
-                    if instance.data.get("publish") is False:
+                    if (
+                        not in_collect_stage
+                        and instance.data.get("publish") is False
+                    ):
                         pyblish.logic.log.debug(
                             "%s was inactive, skipping.." % instance
                         )
@@ -338,7 +342,7 @@ class Controller(QtCore.QObject):
                     yield (plugin, instance)
             else:
                 families = util.collect_families_from_instances(
-                    self.context, only_active=True
+                    self.context, only_active=not in_collect_stage
                 )
                 plugins = pyblish.logic.plugins_by_families(
                     [plugin], families
diff --git a/openpype/tools/pyblish_pype/model.py b/openpype/tools/pyblish_pype/model.py
index 50ba27166b..bb1aff2a9a 100644
--- a/openpype/tools/pyblish_pype/model.py
+++ b/openpype/tools/pyblish_pype/model.py
@@ -498,6 +498,9 @@ class PluginModel(QtGui.QStandardItemModel):
         ):
             new_flag_states[PluginStates.HasError] = True
 
+        if not publish_states & PluginStates.IsCompatible:
+            new_flag_states[PluginStates.IsCompatible] = True
+
         item.setData(new_flag_states, Roles.PublishFlagsRole)
 
         records = item.data(Roles.LogRecordsRole) or []
diff --git a/openpype/tools/settings/settings/categories.py b/openpype/tools/settings/settings/categories.py
index 392c749211..8be3eddfa8 100644
--- a/openpype/tools/settings/settings/categories.py
+++ b/openpype/tools/settings/settings/categories.py
@@ -11,6 +11,7 @@ from openpype.settings.entities import (
     GUIEntity,
     DictImmutableKeysEntity,
     DictMutableKeysEntity,
+    DictConditionalEntity,
     ListEntity,
     PathEntity,
     ListStrictEntity,
@@ -35,6 +36,7 @@ from .base import GUIWidget
 from .list_item_widget import ListWidget
 from .list_strict_widget import ListStrictWidget
 from .dict_mutable_widget import DictMutableKeysWidget
+from .dict_conditional import DictConditionalWidget
 from .item_widgets import (
     BoolWidget,
     DictImmutableKeysWidget,
@@ -100,6 +102,9 @@ class SettingsCategoryWidget(QtWidgets.QWidget):
         if isinstance(entity, GUIEntity):
             return GUIWidget(*args)
 
+        elif isinstance(entity, DictConditionalEntity):
+            return DictConditionalWidget(*args)
+
         elif isinstance(entity, DictImmutableKeysEntity):
             return DictImmutableKeysWidget(*args)
 
@@ -289,6 +294,7 @@ class SettingsCategoryWidget(QtWidgets.QWidget):
             msg = "<br><br>".join(warnings)
 
             dialog = QtWidgets.QMessageBox(self)
+            dialog.setWindowTitle("Save warnings")
             dialog.setText(msg)
             dialog.setIcon(QtWidgets.QMessageBox.Warning)
             dialog.exec_()
@@ -298,6 +304,7 @@ class SettingsCategoryWidget(QtWidgets.QWidget):
         except Exception as exc:
             formatted_traceback = traceback.format_exception(*sys.exc_info())
             dialog = QtWidgets.QMessageBox(self)
+            dialog.setWindowTitle("Unexpected error")
             msg = "Unexpected error happened!\n\nError: {}".format(str(exc))
             dialog.setText(msg)
             dialog.setDetailedText("\n".join(formatted_traceback))
@@ -387,6 +394,7 @@ class SettingsCategoryWidget(QtWidgets.QWidget):
         except Exception as exc:
             formatted_traceback = traceback.format_exception(*sys.exc_info())
             dialog = QtWidgets.QMessageBox(self)
+            dialog.setWindowTitle("Unexpected error")
             msg = "Unexpected error happened!\n\nError: {}".format(str(exc))
             dialog.setText(msg)
             dialog.setDetailedText("\n".join(formatted_traceback))
diff --git a/openpype/tools/settings/settings/dict_conditional.py b/openpype/tools/settings/settings/dict_conditional.py
new file mode 100644
index 0000000000..31a4fa9fab
--- /dev/null
+++ b/openpype/tools/settings/settings/dict_conditional.py
@@ -0,0 +1,345 @@
+from Qt import QtWidgets
+
+from .widgets import (
+    ExpandingWidget,
+    GridLabelWidget
+)
+from .wrapper_widgets import (
+    WrapperWidget,
+    CollapsibleWrapper,
+    FormWrapper
+)
+from .base import BaseWidget
+from openpype.tools.settings import CHILD_OFFSET
+
+
+class DictConditionalWidget(BaseWidget):
+    def create_ui(self):
+        self.input_fields = []
+
+        self._content_by_enum_value = {}
+        self._last_enum_value = None
+
+        self.label_widget = None
+        self.body_widget = None
+        self.content_widget = None
+        self.content_layout = None
+        self.enum_layout = None
+
+        label = None
+        if self.entity.is_dynamic_item:
+            self._ui_as_dynamic_item()
+
+        elif self.entity.use_label_wrap:
+            self._ui_label_wrap()
+
+        else:
+            self._ui_item_base()
+            label = self.entity.label
+
+        self._parent_widget_by_entity_id = {}
+        self._enum_key_by_wrapper_id = {}
+        self._added_wrapper_ids = set()
+
+        enum_layout = QtWidgets.QGridLayout()
+        enum_layout.setContentsMargins(0, 0, 0, 0)
+        enum_layout.setColumnStretch(0, 0)
+        enum_layout.setColumnStretch(1, 1)
+
+        all_children_layout = QtWidgets.QVBoxLayout()
+        all_children_layout.setContentsMargins(0, 0, 0, 0)
+
+        if self.entity.enum_is_horizontal:
+            if self.entity.enum_on_right:
+                self.content_layout.addLayout(all_children_layout, 0, 0)
+                self.content_layout.addLayout(enum_layout, 0, 1)
+                # Stretch combobox to minimum and expand value
+                self.content_layout.setColumnStretch(0, 1)
+                self.content_layout.setColumnStretch(1, 0)
+            else:
+                self.content_layout.addLayout(enum_layout, 0, 0)
+                self.content_layout.addLayout(all_children_layout, 0, 1)
+                # Stretch combobox to minimum and expand value
+                self.content_layout.setColumnStretch(0, 0)
+                self.content_layout.setColumnStretch(1, 1)
+
+        else:
+            # Expand content
+            self.content_layout.setColumnStretch(0, 1)
+            self.content_layout.addLayout(enum_layout, 0, 0)
+            self.content_layout.addLayout(all_children_layout, 1, 0)
+
+        self.enum_layout = enum_layout
+        self.all_children_layout = all_children_layout
+
+        # Add enum entity to layout mapping
+        enum_entity = self.entity.enum_entity
+        self._parent_widget_by_entity_id[enum_entity.id] = self.content_widget
+
+        # Add rest of entities to wrapper mappings
+        for enum_key, children in self.entity.gui_layout.items():
+            parent_widget_by_entity_id = {}
+
+            content_widget = QtWidgets.QWidget(self.content_widget)
+            content_layout = QtWidgets.QGridLayout(content_widget)
+            content_layout.setColumnStretch(0, 0)
+            content_layout.setColumnStretch(1, 1)
+            content_layout.setContentsMargins(0, 0, 0, 0)
+            content_layout.setSpacing(5)
+
+            all_children_layout.addWidget(content_widget)
+
+            self._content_by_enum_value[enum_key] = {
+                "widget": content_widget,
+                "layout": content_layout
+            }
+
+            self._prepare_entity_layouts(
+                children,
+                content_widget,
+                parent_widget_by_entity_id
+            )
+            for item_id in parent_widget_by_entity_id.keys():
+                self._enum_key_by_wrapper_id[item_id] = enum_key
+            self._parent_widget_by_entity_id.update(parent_widget_by_entity_id)
+
+        enum_input_field = self.create_ui_for_entity(
+            self.category_widget, self.entity.enum_entity, self
+        )
+        self.enum_input_field = enum_input_field
+        self.input_fields.append(enum_input_field)
+
+        for item_key, children in self.entity.children.items():
+            content_widget = self._content_by_enum_value[item_key]["widget"]
+            for child_obj in children:
+                self.input_fields.append(
+                    self.create_ui_for_entity(
+                        self.category_widget, child_obj, self
+                    )
+                )
+
+        if self.entity.use_label_wrap and self.content_layout.count() == 0:
+            self.body_widget.hide_toolbox(True)
+
+        self.entity_widget.add_widget_to_layout(self, label)
+
+    def _prepare_entity_layouts(
+        self, gui_layout, widget, parent_widget_by_entity_id
+    ):
+        for child in gui_layout:
+            if not isinstance(child, dict):
+                parent_widget_by_entity_id[child.id] = widget
+                continue
+
+            if child["type"] == "collapsible-wrap":
+                wrapper = CollapsibleWrapper(child, widget)
+
+            elif child["type"] == "form":
+                wrapper = FormWrapper(child, widget)
+
+            else:
+                raise KeyError(
+                    "Unknown Wrapper type \"{}\"".format(child["type"])
+                )
+
+            parent_widget_by_entity_id[wrapper.id] = widget
+
+            self._prepare_entity_layouts(
+                child["children"], wrapper, parent_widget_by_entity_id
+            )
+
+    def _ui_item_base(self):
+        self.setObjectName("DictInvisible")
+
+        self.content_widget = self
+        self.content_layout = QtWidgets.QGridLayout(self)
+        self.content_layout.setContentsMargins(0, 0, 0, 0)
+        self.content_layout.setSpacing(5)
+
+    def _ui_as_dynamic_item(self):
+        content_widget = QtWidgets.QWidget(self)
+        content_widget.setObjectName("DictAsWidgetBody")
+
+        show_borders = str(int(self.entity.show_borders))
+        content_widget.setProperty("show_borders", show_borders)
+
+        label_widget = QtWidgets.QLabel(self.entity.label)
+
+        content_layout = QtWidgets.QGridLayout(content_widget)
+        content_layout.setContentsMargins(5, 5, 5, 5)
+
+        main_layout = QtWidgets.QHBoxLayout(self)
+        main_layout.setContentsMargins(0, 0, 0, 0)
+        main_layout.setSpacing(5)
+        main_layout.addWidget(content_widget)
+
+        self.label_widget = label_widget
+        self.content_widget = content_widget
+        self.content_layout = content_layout
+
+    def _ui_label_wrap(self):
+        content_widget = QtWidgets.QWidget(self)
+        content_widget.setObjectName("ContentWidget")
+
+        if self.entity.highlight_content:
+            content_state = "hightlighted"
+            bottom_margin = 5
+        else:
+            content_state = ""
+            bottom_margin = 0
+        content_widget.setProperty("content_state", content_state)
+        content_layout_margins = (CHILD_OFFSET, 5, 0, bottom_margin)
+
+        body_widget = ExpandingWidget(self.entity.label, self)
+        label_widget = body_widget.label_widget
+        body_widget.set_content_widget(content_widget)
+
+        content_layout = QtWidgets.QGridLayout(content_widget)
+        content_layout.setContentsMargins(*content_layout_margins)
+
+        main_layout = QtWidgets.QHBoxLayout(self)
+        main_layout.setContentsMargins(0, 0, 0, 0)
+        main_layout.setSpacing(0)
+        main_layout.addWidget(body_widget)
+
+        self.label_widget = label_widget
+        self.body_widget = body_widget
+        self.content_widget = content_widget
+        self.content_layout = content_layout
+
+        if self.entity.collapsible:
+            if not self.entity.collapsed:
+                body_widget.toggle_content()
+        else:
+            body_widget.hide_toolbox(hide_content=False)
+
+    def add_widget_to_layout(self, widget, label=None):
+        if not widget.entity:
+            map_id = widget.id
+        else:
+            map_id = widget.entity.id
+
+        is_enum_item = map_id == self.entity.enum_entity.id
+        if is_enum_item:
+            content_widget = self.content_widget
+            content_layout = self.enum_layout
+
+            if not label:
+                content_layout.addWidget(widget, 0, 0, 1, 2)
+                return
+
+            label_widget = GridLabelWidget(label, widget)
+            label_widget.input_field = widget
+            widget.label_widget = label_widget
+            content_layout.addWidget(label_widget, 0, 0, 1, 1)
+            content_layout.addWidget(widget, 0, 1, 1, 1)
+            return
+
+        enum_value = self._enum_key_by_wrapper_id[map_id]
+        content_widget = self._content_by_enum_value[enum_value]["widget"]
+        content_layout = self._content_by_enum_value[enum_value]["layout"]
+
+        wrapper = self._parent_widget_by_entity_id[map_id]
+        if wrapper is not content_widget:
+            wrapper.add_widget_to_layout(widget, label)
+            if wrapper.id not in self._added_wrapper_ids:
+                self.add_widget_to_layout(wrapper)
+                self._added_wrapper_ids.add(wrapper.id)
+            return
+
+        row = content_layout.rowCount()
+        if not label or isinstance(widget, WrapperWidget):
+            content_layout.addWidget(widget, row, 0, 1, 2)
+        else:
+            label_widget = GridLabelWidget(label, widget)
+            label_widget.input_field = widget
+            widget.label_widget = label_widget
+            content_layout.addWidget(label_widget, row, 0, 1, 1)
+            content_layout.addWidget(widget, row, 1, 1, 1)
+
+    def set_entity_value(self):
+        for input_field in self.input_fields:
+            input_field.set_entity_value()
+
+        self._on_entity_change()
+
+    def hierarchical_style_update(self):
+        self.update_style()
+        for input_field in self.input_fields:
+            input_field.hierarchical_style_update()
+
+    def update_style(self):
+        if not self.body_widget and not self.label_widget:
+            return
+
+        if self.entity.group_item:
+            group_item = self.entity.group_item
+            has_unsaved_changes = group_item.has_unsaved_changes
+            has_project_override = group_item.has_project_override
+            has_studio_override = group_item.has_studio_override
+        else:
+            has_unsaved_changes = self.entity.has_unsaved_changes
+            has_project_override = self.entity.has_project_override
+            has_studio_override = self.entity.has_studio_override
+
+        style_state = self.get_style_state(
+            self.is_invalid,
+            has_unsaved_changes,
+            has_project_override,
+            has_studio_override
+        )
+        if self._style_state == style_state:
+            return
+
+        self._style_state = style_state
+
+        if self.body_widget:
+            if style_state:
+                child_style_state = "child-{}".format(style_state)
+            else:
+                child_style_state = ""
+
+            self.body_widget.side_line_widget.setProperty(
+                "state", child_style_state
+            )
+            self.body_widget.side_line_widget.style().polish(
+                self.body_widget.side_line_widget
+            )
+
+        # There is nothing to care if there is no label
+        if not self.label_widget:
+            return
+
+        # Don't change label if is not group or under group item
+        if not self.entity.is_group and not self.entity.group_item:
+            return
+
+        self.label_widget.setProperty("state", style_state)
+        self.label_widget.style().polish(self.label_widget)
+
+    def _on_entity_change(self):
+        enum_value = self.enum_input_field.entity.value
+        if enum_value == self._last_enum_value:
+            return
+
+        self._last_enum_value = enum_value
+        for item_key, content in self._content_by_enum_value.items():
+            widget = content["widget"]
+            widget.setVisible(item_key == enum_value)
+
+    @property
+    def is_invalid(self):
+        return self._is_invalid or self._child_invalid
+
+    @property
+    def _child_invalid(self):
+        for input_field in self.input_fields:
+            if input_field.is_invalid:
+                return True
+        return False
+
+    def get_invalid(self):
+        invalid = []
+        for input_field in self.input_fields:
+            invalid.extend(input_field.get_invalid())
+        return invalid
diff --git a/openpype/tools/settings/settings/dict_mutable_widget.py b/openpype/tools/settings/settings/dict_mutable_widget.py
index df6525e86a..3526dc60b5 100644
--- a/openpype/tools/settings/settings/dict_mutable_widget.py
+++ b/openpype/tools/settings/settings/dict_mutable_widget.py
@@ -1,12 +1,11 @@
 from uuid import uuid4
 
-from Qt import QtWidgets, QtCore
+from Qt import QtWidgets, QtCore, QtGui
 
 from .base import BaseWidget
 from .widgets import (
     ExpandingWidget,
-    IconButton,
-    SpacerWidget
+    IconButton
 )
 from openpype.tools.settings import (
     BTN_FIXED_SIZE,
@@ -15,6 +14,69 @@ from openpype.tools.settings import (
 from openpype.settings.constants import KEY_REGEX
 
 
+KEY_INPUT_TOOLTIP = (
+    "Keys can't be duplicated and may contain alphabetical character (a-Z)"
+    "\nnumerical characters (0-9) dash (\"-\") or underscore (\"_\")."
+)
+
+
+class PaintHelper:
+    cached_icons = {}
+
+    @classmethod
+    def _draw_image(cls, width, height, brush):
+        image = QtGui.QPixmap(width, height)
+        image.fill(QtCore.Qt.transparent)
+
+        icon_path_stroker = QtGui.QPainterPathStroker()
+        icon_path_stroker.setCapStyle(QtCore.Qt.RoundCap)
+        icon_path_stroker.setJoinStyle(QtCore.Qt.RoundJoin)
+        icon_path_stroker.setWidth(height / 5)
+
+        painter = QtGui.QPainter(image)
+        painter.setPen(QtCore.Qt.transparent)
+        painter.setBrush(brush)
+        rect = QtCore.QRect(0, 0, image.width(), image.height())
+        fifteenth = rect.height() / 15
+        # Left point
+        p1 = QtCore.QPoint(
+            rect.x() + (5 * fifteenth),
+            rect.y() + (9 * fifteenth)
+        )
+        # Middle bottom point
+        p2 = QtCore.QPoint(
+            rect.center().x(),
+            rect.y() + (11 * fifteenth)
+        )
+        # Top right point
+        p3 = QtCore.QPoint(
+            rect.x() + (10 * fifteenth),
+            rect.y() + (5 * fifteenth)
+        )
+
+        path = QtGui.QPainterPath(p1)
+        path.lineTo(p2)
+        path.lineTo(p3)
+
+        stroked_path = icon_path_stroker.createStroke(path)
+        painter.drawPath(stroked_path)
+
+        painter.end()
+
+        return image
+
+    @classmethod
+    def get_confirm_icon(cls, width, height):
+        key = "{}x{}-confirm_image".format(width, height)
+        icon = cls.cached_icons.get(key)
+
+        if icon is None:
+            image = cls._draw_image(width, height, QtCore.Qt.white)
+            icon = QtGui.QIcon(image)
+            cls.cached_icons[key] = icon
+        return icon
+
+
 def create_add_btn(parent):
     add_btn = QtWidgets.QPushButton("+", parent)
     add_btn.setFocusPolicy(QtCore.Qt.ClickFocus)
@@ -31,6 +93,19 @@ def create_remove_btn(parent):
     return remove_btn
 
 
+def create_confirm_btn(parent):
+    confirm_btn = QtWidgets.QPushButton(parent)
+
+    icon = PaintHelper.get_confirm_icon(
+        BTN_FIXED_SIZE, BTN_FIXED_SIZE
+    )
+    confirm_btn.setIcon(icon)
+    confirm_btn.setFocusPolicy(QtCore.Qt.ClickFocus)
+    confirm_btn.setProperty("btn-type", "tool-item")
+    confirm_btn.setFixedSize(BTN_FIXED_SIZE, BTN_FIXED_SIZE)
+    return confirm_btn
+
+
 class ModifiableDictEmptyItem(QtWidgets.QWidget):
     def __init__(self, entity_widget, store_as_list, parent):
         super(ModifiableDictEmptyItem, self).__init__(parent)
@@ -42,6 +117,8 @@ class ModifiableDictEmptyItem(QtWidgets.QWidget):
         self.is_duplicated = False
         self.key_is_valid = store_as_list
 
+        self.confirm_btn = None
+
         if self.collapsible_key:
             self.create_collapsible_ui()
         else:
@@ -61,7 +138,6 @@ class ModifiableDictEmptyItem(QtWidgets.QWidget):
     def create_addible_ui(self):
         add_btn = create_add_btn(self)
         remove_btn = create_remove_btn(self)
-        spacer_widget = SpacerWidget(self)
 
         remove_btn.setEnabled(False)
 
@@ -70,13 +146,12 @@ class ModifiableDictEmptyItem(QtWidgets.QWidget):
         layout.setSpacing(3)
         layout.addWidget(add_btn, 0)
         layout.addWidget(remove_btn, 0)
-        layout.addWidget(spacer_widget, 1)
+        layout.addStretch(1)
 
         add_btn.clicked.connect(self._on_add_clicked)
 
         self.add_btn = add_btn
         self.remove_btn = remove_btn
-        self.spacer_widget = spacer_widget
 
     def _on_focus_lose(self):
         if self.key_input.hasFocus() or self.key_label_input.hasFocus():
@@ -111,7 +186,16 @@ class ModifiableDictEmptyItem(QtWidgets.QWidget):
         self.is_duplicated = self.entity_widget.is_key_duplicated(key)
         key_input_state = ""
         # Collapsible key and empty key are not invalid
-        if self.collapsible_key and self.key_input.text() == "":
+        key_value = self.key_input.text()
+        if self.confirm_btn is not None:
+            conf_disabled = (
+                key_value == ""
+                or not self.key_is_valid
+                or self.is_duplicated
+            )
+            self.confirm_btn.setEnabled(not conf_disabled)
+
+        if self.collapsible_key and key_value == "":
             pass
         elif self.is_duplicated or not self.key_is_valid:
             key_input_state = "invalid"
@@ -124,6 +208,7 @@ class ModifiableDictEmptyItem(QtWidgets.QWidget):
     def create_collapsible_ui(self):
         key_input = QtWidgets.QLineEdit(self)
         key_input.setObjectName("DictKey")
+        key_input.setToolTip(KEY_INPUT_TOOLTIP)
 
         key_label_input = QtWidgets.QLineEdit(self)
 
@@ -141,11 +226,15 @@ class ModifiableDictEmptyItem(QtWidgets.QWidget):
         key_input_label_widget = QtWidgets.QLabel("Key:", self)
         key_label_input_label_widget = QtWidgets.QLabel("Label:", self)
 
+        confirm_btn = create_confirm_btn(self)
+        confirm_btn.setEnabled(False)
+
         wrapper_widget = ExpandingWidget("", self)
         wrapper_widget.add_widget_after_label(key_input_label_widget)
         wrapper_widget.add_widget_after_label(key_input)
         wrapper_widget.add_widget_after_label(key_label_input_label_widget)
         wrapper_widget.add_widget_after_label(key_label_input)
+        wrapper_widget.add_widget_after_label(confirm_btn)
         wrapper_widget.hide_toolbox()
 
         layout = QtWidgets.QVBoxLayout(self)
@@ -157,9 +246,12 @@ class ModifiableDictEmptyItem(QtWidgets.QWidget):
         key_input.returnPressed.connect(self._on_enter_press)
         key_label_input.returnPressed.connect(self._on_enter_press)
 
+        confirm_btn.clicked.connect(self._on_enter_press)
+
         self.key_input = key_input
         self.key_label_input = key_label_input
         self.wrapper_widget = wrapper_widget
+        self.confirm_btn = confirm_btn
 
 
 class ModifiableDictItem(QtWidgets.QWidget):
@@ -190,10 +282,14 @@ class ModifiableDictItem(QtWidgets.QWidget):
 
         self.key_label_input = None
 
+        self.confirm_btn = None
+
         if collapsible_key:
             self.create_collapsible_ui()
         else:
             self.create_addible_ui()
+
+        self.key_input.setToolTip(KEY_INPUT_TOOLTIP)
         self.update_style()
 
     @property
@@ -277,6 +373,9 @@ class ModifiableDictItem(QtWidgets.QWidget):
         edit_btn.setProperty("btn-type", "tool-item-icon")
         edit_btn.setFixedHeight(BTN_FIXED_SIZE)
 
+        confirm_btn = create_confirm_btn(self)
+        confirm_btn.setVisible(False)
+
         remove_btn = create_remove_btn(self)
 
         key_input_label_widget = QtWidgets.QLabel("Key:")
@@ -286,6 +385,7 @@ class ModifiableDictItem(QtWidgets.QWidget):
         wrapper_widget.add_widget_after_label(key_input)
         wrapper_widget.add_widget_after_label(key_label_input_label_widget)
         wrapper_widget.add_widget_after_label(key_label_input)
+        wrapper_widget.add_widget_after_label(confirm_btn)
         wrapper_widget.add_widget_after_label(remove_btn)
 
         key_input.textChanged.connect(self._on_key_change)
@@ -295,6 +395,7 @@ class ModifiableDictItem(QtWidgets.QWidget):
         key_label_input.returnPressed.connect(self._on_enter_press)
 
         edit_btn.clicked.connect(self.on_edit_pressed)
+        confirm_btn.clicked.connect(self._on_enter_press)
         remove_btn.clicked.connect(self.on_remove_clicked)
 
         # Hide edit inputs
@@ -310,6 +411,7 @@ class ModifiableDictItem(QtWidgets.QWidget):
         self.key_label_input_label_widget = key_label_input_label_widget
         self.wrapper_widget = wrapper_widget
         self.edit_btn = edit_btn
+        self.confirm_btn = confirm_btn
         self.remove_btn = remove_btn
 
         self.content_widget = content_widget
@@ -415,6 +517,14 @@ class ModifiableDictItem(QtWidgets.QWidget):
             self.temp_key, key, self
         )
         self.temp_key = key
+        if self.confirm_btn is not None:
+            conf_disabled = (
+                key == ""
+                or not self.key_is_valid
+                or is_key_duplicated
+            )
+            self.confirm_btn.setEnabled(not conf_disabled)
+
         if is_key_duplicated or not self.key_is_valid:
             return
 
@@ -434,7 +544,7 @@ class ModifiableDictItem(QtWidgets.QWidget):
         key_value = self.key_input.text()
         key_label_value = self.key_label_input.text()
         if key_label_value:
-            label = "{} ({})".format(key_label_value, key_value)
+            label = "{} ({})".format(key_value, key_label_value)
         else:
             label = key_value
         self.wrapper_widget.label_widget.setText(label)
@@ -457,6 +567,7 @@ class ModifiableDictItem(QtWidgets.QWidget):
         self.key_input.setVisible(enabled)
         self.key_input_label_widget.setVisible(enabled)
         self.key_label_input.setVisible(enabled)
+        self.confirm_btn.setVisible(enabled)
         if not self.is_required:
             self.remove_btn.setVisible(enabled)
         if enabled:
@@ -681,10 +792,6 @@ class DictMutableKeysWidget(BaseWidget):
     def remove_key(self, widget):
         key = self.entity.get_child_key(widget.entity)
         self.entity.pop(key)
-        # Poping of key from entity should remove the entity and input field.
-        #   this is kept for testing purposes.
-        if widget in self.input_fields:
-            self.remove_row(widget)
 
     def change_key(self, new_key, widget):
         if not new_key or widget.is_key_duplicated:
@@ -751,6 +858,11 @@ class DictMutableKeysWidget(BaseWidget):
         return input_field
 
     def remove_row(self, widget):
+        if widget.is_key_duplicated:
+            new_key = widget.uuid_key
+            if new_key is None:
+                new_key = str(uuid4())
+            self.validate_key_duplication(widget.temp_key, new_key, widget)
         self.input_fields.remove(widget)
         self.content_layout.removeWidget(widget)
         widget.deleteLater()
@@ -834,7 +946,10 @@ class DictMutableKeysWidget(BaseWidget):
                 _input_field.set_entity_value()
 
             else:
-                if input_field.key_value() != key:
+                if (
+                    not input_field.is_key_duplicated
+                    and input_field.key_value() != key
+                ):
                     changed = True
                     input_field.set_key(key)
 
diff --git a/openpype/tools/settings/settings/item_widgets.py b/openpype/tools/settings/settings/item_widgets.py
index b23372e9ac..82afbb0a13 100644
--- a/openpype/tools/settings/settings/item_widgets.py
+++ b/openpype/tools/settings/settings/item_widgets.py
@@ -145,7 +145,7 @@ class DictImmutableKeysWidget(BaseWidget):
         self.content_widget = content_widget
         self.content_layout = content_layout
 
-        if len(self.input_fields) == 1 and self.checkbox_widget:
+        if len(self.input_fields) == 1 and self.checkbox_child:
             body_widget.hide_toolbox(hide_content=True)
 
         elif self.entity.collapsible:
diff --git a/openpype/tools/settings/settings/list_item_widget.py b/openpype/tools/settings/settings/list_item_widget.py
index 82ca541132..c9df5caf01 100644
--- a/openpype/tools/settings/settings/list_item_widget.py
+++ b/openpype/tools/settings/settings/list_item_widget.py
@@ -117,6 +117,9 @@ class ListItem(QtWidgets.QWidget):
 
         self.spacer_widget = spacer_widget
 
+        self._row = -1
+        self._is_last = False
+
     @property
     def category_widget(self):
         return self.entity_widget.category_widget
@@ -136,28 +139,40 @@ class ListItem(QtWidgets.QWidget):
     def add_widget_to_layout(self, widget, label=None):
         self.content_layout.addWidget(widget, 1)
 
+    def set_row(self, row, is_last):
+        if row == self._row and is_last == self._is_last:
+            return
+
+        trigger_order_changed = (
+            row != self._row
+            or is_last != self._is_last
+        )
+        self._row = row
+        self._is_last = is_last
+
+        if trigger_order_changed:
+            self.order_changed()
+
+    @property
     def row(self):
-        return self.entity_widget.input_fields.index(self)
+        return self._row
 
     def parent_rows_count(self):
         return len(self.entity_widget.input_fields)
 
     def _on_add_clicked(self):
-        self.entity_widget.add_new_item(row=self.row() + 1)
+        self.entity_widget.add_new_item(row=self.row + 1)
 
     def _on_remove_clicked(self):
         self.entity_widget.remove_row(self)
 
     def _on_up_clicked(self):
-        row = self.row()
-        self.entity_widget.swap_rows(row - 1, row)
+        self.entity_widget.swap_rows(self.row - 1, self.row)
 
     def _on_down_clicked(self):
-        row = self.row()
-        self.entity_widget.swap_rows(row, row + 1)
+        self.entity_widget.swap_rows(self.row, self.row + 1)
 
     def order_changed(self):
-        row = self.row()
         parent_row_count = self.parent_rows_count()
         if parent_row_count == 1:
             self.up_btn.setVisible(False)
@@ -168,11 +183,11 @@ class ListItem(QtWidgets.QWidget):
             self.up_btn.setVisible(True)
             self.down_btn.setVisible(True)
 
-        if row == 0:
+        if self.row == 0:
             self.up_btn.setEnabled(False)
             self.down_btn.setEnabled(True)
 
-        elif row == parent_row_count - 1:
+        elif self.row == parent_row_count - 1:
             self.up_btn.setEnabled(True)
             self.down_btn.setEnabled(False)
 
@@ -191,6 +206,7 @@ class ListWidget(InputWidget):
     def create_ui(self):
         self._child_style_state = ""
         self.input_fields = []
+        self._input_fields_by_entity_id = {}
 
         main_layout = QtWidgets.QHBoxLayout(self)
         main_layout.setContentsMargins(0, 0, 0, 0)
@@ -243,8 +259,7 @@ class ListWidget(InputWidget):
         self.entity_widget.add_widget_to_layout(self, entity_label)
 
     def set_entity_value(self):
-        for input_field in tuple(self.input_fields):
-            self.remove_row(input_field)
+        self.remove_all_rows()
 
         for entity in self.entity.children:
             self.add_row(entity)
@@ -262,39 +277,60 @@ class ListWidget(InputWidget):
 
     def _on_entity_change(self):
         # TODO do less inefficient
-        input_field_last_idx = len(self.input_fields) - 1
-        child_len = len(self.entity)
+        childen_order = []
+        new_children = []
         for idx, child_entity in enumerate(self.entity):
-            if idx > input_field_last_idx:
-                self.add_row(child_entity, idx)
-                input_field_last_idx += 1
+            input_field = self._input_fields_by_entity_id.get(child_entity.id)
+            if input_field is not None:
+                childen_order.append(input_field)
+            else:
+                new_children.append((idx, child_entity))
+
+        order_changed = False
+        for idx, input_field in enumerate(childen_order):
+            current_field = self.input_fields[idx]
+            if current_field is input_field:
                 continue
+            order_changed = True
+            old_idx = self.input_fields.index(input_field)
+            self.input_fields[old_idx], self.input_fields[idx] = (
+                current_field, input_field
+            )
+            self.content_layout.insertWidget(idx + 1, input_field)
 
-            if self.input_fields[idx].entity is child_entity:
-                continue
+        kept_len = len(childen_order)
+        fields_len = len(self.input_fields)
+        if fields_len > kept_len:
+            order_changed = True
+            for row in reversed(range(kept_len, fields_len)):
+                self.remove_row(row=row)
 
-            input_field_idx = None
-            for _input_field_idx, input_field in enumerate(self.input_fields):
-                if input_field.entity is child_entity:
-                    input_field_idx = _input_field_idx
-                    break
+        for idx, child_entity in new_children:
+            order_changed = False
+            self.add_row(child_entity, idx)
 
-            if input_field_idx is None:
-                self.add_row(child_entity, idx)
-                input_field_last_idx += 1
-                continue
+        if not order_changed:
+            return
 
-            input_field = self.input_fields.pop(input_field_idx)
-            self.input_fields.insert(idx, input_field)
-            self.content_layout.insertWidget(idx, input_field)
+        self._on_order_change()
 
-        new_input_field_len = len(self.input_fields)
-        if child_len != new_input_field_len:
-            for _idx in range(child_len, new_input_field_len):
-                # Remove row at the same index
-                self.remove_row(self.input_fields[child_len])
+        input_field_len = self.count()
+        self.empty_row.setVisible(input_field_len == 0)
 
-        self.empty_row.setVisible(self.count() == 0)
+    def _on_order_change(self):
+        last_idx = self.count() - 1
+        previous_input = None
+        for idx, input_field in enumerate(self.input_fields):
+            input_field.set_row(idx, idx == last_idx)
+            next_input = input_field.input_field.focusProxy()
+            if previous_input is not None:
+                self.setTabOrder(previous_input, next_input)
+            else:
+                self.setTabOrder(self, next_input)
+            previous_input = next_input
+
+        if previous_input is not None:
+            self.setTabOrder(previous_input, self)
 
     def count(self):
         return len(self.input_fields)
@@ -307,32 +343,20 @@ class ListWidget(InputWidget):
 
     def add_new_item(self, row=None):
         new_entity = self.entity.add_new_item(row)
-        for input_field in self.input_fields:
-            if input_field.entity is new_entity:
-                input_field.input_field.setFocus(True)
-                break
+        input_field = self._input_fields_by_entity_id.get(new_entity.id)
+        if input_field is not None:
+            input_field.input_field.setFocus(True)
         return new_entity
 
     def add_row(self, child_entity, row=None):
         # Create new item
         item_widget = ListItem(child_entity, self)
-
-        previous_field = None
-        next_field = None
+        self._input_fields_by_entity_id[child_entity.id] = item_widget
 
         if row is None:
-            if self.input_fields:
-                previous_field = self.input_fields[-1]
             self.content_layout.addWidget(item_widget)
             self.input_fields.append(item_widget)
         else:
-            if row > 0:
-                previous_field = self.input_fields[row - 1]
-
-            max_index = self.count()
-            if row < max_index:
-                next_field = self.input_fields[row]
-
             self.content_layout.insertWidget(row + 1, item_widget)
             self.input_fields.insert(row, item_widget)
 
@@ -342,49 +366,53 @@ class ListWidget(InputWidget):
         #   added as widget here which won't because is not in input_fields
         item_widget.input_field.set_entity_value()
 
-        if previous_field:
-            previous_field.order_changed()
+        self._on_order_change()
 
-        if next_field:
-            next_field.order_changed()
-
-        item_widget.order_changed()
-
-        previous_input = None
-        for input_field in self.input_fields:
-            if previous_input is not None:
-                self.setTabOrder(
-                    previous_input, input_field.input_field.focusProxy()
-                )
-            previous_input = input_field.input_field.focusProxy()
+        input_field_len = self.count()
+        self.empty_row.setVisible(input_field_len == 0)
 
         self.updateGeometry()
 
-    def remove_row(self, item_widget):
-        row = self.input_fields.index(item_widget)
-        previous_field = None
-        next_field = None
-        if row > 0:
-            previous_field = self.input_fields[row - 1]
+    def remove_all_rows(self):
+        self._input_fields_by_entity_id = {}
+        while self.input_fields:
+            item_widget = self.input_fields.pop(0)
+            self.content_layout.removeWidget(item_widget)
+            item_widget.setParent(None)
+            item_widget.deleteLater()
 
-        if row != len(self.input_fields) - 1:
-            next_field = self.input_fields[row + 1]
+        self.empty_row.setVisible(True)
+
+        self.updateGeometry()
+
+    def remove_row(self, item_widget=None, row=None):
+        if item_widget is None:
+            item_widget = self.input_fields[row]
+        elif row is None:
+            row = self.input_fields.index(item_widget)
 
         self.content_layout.removeWidget(item_widget)
         self.input_fields.pop(row)
+        self._input_fields_by_entity_id.pop(item_widget.entity.id)
         item_widget.setParent(None)
         item_widget.deleteLater()
 
         if item_widget.entity in self.entity:
             self.entity.remove(item_widget.entity)
 
-        if previous_field:
-            previous_field.order_changed()
+        rows = self.count()
+        any_item = rows == 0
+        if any_item:
+            start_row = 0
+            if row > 0:
+                start_row = row - 1
 
-        if next_field:
-            next_field.order_changed()
+            last_row = rows - 1
+            _enum = enumerate(self.input_fields[start_row:rows])
+            for idx, _item_widget in _enum:
+                _item_widget.set_row(idx, idx == last_row)
 
-        self.empty_row.setVisible(self.count() == 0)
+        self.empty_row.setVisible(any_item)
 
         self.updateGeometry()
 
diff --git a/openpype/tools/settings/settings/window.py b/openpype/tools/settings/settings/window.py
index a60a2a1d88..4e88301349 100644
--- a/openpype/tools/settings/settings/window.py
+++ b/openpype/tools/settings/settings/window.py
@@ -94,7 +94,8 @@ class MainWidget(QtWidgets.QWidget):
         super(MainWidget, self).showEvent(event)
         if self._reset_on_show:
             self._reset_on_show = False
-            self.reset()
+            # Trigger reset with 100ms delay
+            QtCore.QTimer.singleShot(100, self.reset)
 
     def _show_password_dialog(self):
         if self._password_dialog:
@@ -107,6 +108,8 @@ class MainWidget(QtWidgets.QWidget):
         self._password_dialog = None
         if password_passed:
             self.reset()
+            if not self.isVisible():
+                self.show()
         else:
             self.close()
 
@@ -141,7 +144,10 @@ class MainWidget(QtWidgets.QWidget):
         # Don't show dialog if there are not registered slots for
         #   `trigger_restart` signal.
         # - For example when settings are runnin as standalone tool
-        if self.receivers(self.trigger_restart) < 1:
+        # - PySide2 and PyQt5 compatible way how to find out
+        method_index = self.metaObject().indexOfMethod("trigger_restart()")
+        method = self.metaObject().method(method_index)
+        if not self.isSignalConnected(method):
             return
 
         dialog = RestartDialog(self)
diff --git a/openpype/tools/standalonepublish/app.py b/openpype/tools/standalonepublish/app.py
index 169abe530a..81a53c52b8 100644
--- a/openpype/tools/standalonepublish/app.py
+++ b/openpype/tools/standalonepublish/app.py
@@ -34,6 +34,13 @@ class Window(QtWidgets.QDialog):
         self._db = AvalonMongoDB()
         self._db.install()
 
+        try:
+            settings = QtCore.QSettings("pypeclub", "StandalonePublisher")
+        except Exception:
+            settings = None
+
+        self._settings = settings
+
         self.pyblish_paths = pyblish_paths
 
         self.setWindowTitle("Standalone Publish")
@@ -44,7 +51,7 @@ class Window(QtWidgets.QDialog):
         self.valid_parent = False
 
         # assets widget
-        widget_assets = AssetWidget(dbcon=self._db, parent=self)
+        widget_assets = AssetWidget(self._db, settings, self)
 
         # family widget
         widget_family = FamilyWidget(dbcon=self._db, parent=self)
diff --git a/openpype/tools/standalonepublish/widgets/widget_asset.py b/openpype/tools/standalonepublish/widgets/widget_asset.py
index 4680e88344..c39d71b055 100644
--- a/openpype/tools/standalonepublish/widgets/widget_asset.py
+++ b/openpype/tools/standalonepublish/widgets/widget_asset.py
@@ -127,11 +127,12 @@ class AssetWidget(QtWidgets.QWidget):
     current_changed = QtCore.Signal()    # on view current index change
     task_changed = QtCore.Signal()
 
-    def __init__(self, dbcon, parent=None):
+    def __init__(self, dbcon, settings, parent=None):
         super(AssetWidget, self).__init__(parent=parent)
         self.setContentsMargins(0, 0, 0, 0)
 
         self.dbcon = dbcon
+        self._settings = settings
 
         layout = QtWidgets.QVBoxLayout()
         layout.setContentsMargins(0, 0, 0, 0)
@@ -139,6 +140,10 @@ class AssetWidget(QtWidgets.QWidget):
 
         # Project
         self.combo_projects = QtWidgets.QComboBox()
+        # Change delegate so stylysheets are applied
+        project_delegate = QtWidgets.QStyledItemDelegate(self.combo_projects)
+        self.combo_projects.setItemDelegate(project_delegate)
+
         self._set_projects()
         self.combo_projects.currentTextChanged.connect(self.on_project_change)
         # Tree View
@@ -198,6 +203,7 @@ class AssetWidget(QtWidgets.QWidget):
 
         self.selection_changed.connect(self._refresh_tasks)
 
+        self.project_delegate = project_delegate
         self.task_view = task_view
         self.task_model = task_model
         self.refreshButton = refresh
@@ -237,15 +243,59 @@ class AssetWidget(QtWidgets.QWidget):
         output.extend(self.get_parents(parent))
         return output
 
+    def _get_last_projects(self):
+        if not self._settings:
+            return []
+
+        project_names = []
+        for project_name in self._settings.value("projects", "").split("|"):
+            if project_name:
+                project_names.append(project_name)
+        return project_names
+
+    def _add_last_project(self, project_name):
+        if not self._settings:
+            return
+
+        last_projects = []
+        for _project_name in self._settings.value("projects", "").split("|"):
+            if _project_name:
+                last_projects.append(_project_name)
+
+        if project_name in last_projects:
+            last_projects.remove(project_name)
+
+        last_projects.insert(0, project_name)
+        while len(last_projects) > 5:
+            last_projects.pop(-1)
+
+        self._settings.setValue("projects", "|".join(last_projects))
+
     def _set_projects(self):
-        projects = list()
+        project_names = list()
         for project in self.dbcon.projects():
-            projects.append(project['name'])
+            project_name = project.get("name")
+            if project_name:
+                project_names.append(project_name)
 
         self.combo_projects.clear()
-        if len(projects) > 0:
-            self.combo_projects.addItems(projects)
-            self.dbcon.Session["AVALON_PROJECT"] = projects[0]
+
+        if not project_names:
+            return
+
+        sorted_project_names = list(sorted(project_names))
+        self.combo_projects.addItems(list(sorted(sorted_project_names)))
+
+        last_project = sorted_project_names[0]
+        for project_name in self._get_last_projects():
+            if project_name in sorted_project_names:
+                last_project = project_name
+                break
+
+        index = sorted_project_names.index(last_project)
+        self.combo_projects.setCurrentIndex(index)
+
+        self.dbcon.Session["AVALON_PROJECT"] = last_project
 
     def on_project_change(self):
         projects = list()
@@ -254,6 +304,7 @@ class AssetWidget(QtWidgets.QWidget):
         project_name = self.combo_projects.currentText()
         if project_name in projects:
             self.dbcon.Session["AVALON_PROJECT"] = project_name
+            self._add_last_project(project_name)
 
         self.project_changed.emit(project_name)
 
diff --git a/openpype/tools/standalonepublish/widgets/widget_component_item.py b/openpype/tools/standalonepublish/widgets/widget_component_item.py
index 186c8024db..de3cde50cd 100644
--- a/openpype/tools/standalonepublish/widgets/widget_component_item.py
+++ b/openpype/tools/standalonepublish/widgets/widget_component_item.py
@@ -1,7 +1,6 @@
 import os
 from Qt import QtCore, QtGui, QtWidgets
 from .resources import get_resource
-from avalon import style
 
 
 class ComponentItem(QtWidgets.QFrame):
@@ -61,7 +60,7 @@ class ComponentItem(QtWidgets.QFrame):
             name="menu", size=QtCore.QSize(22, 22)
         )
 
-        self.action_menu = QtWidgets.QMenu()
+        self.action_menu = QtWidgets.QMenu(self.btn_action_menu)
 
         expanding_sizePolicy = QtWidgets.QSizePolicy(
             QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
@@ -229,7 +228,6 @@ class ComponentItem(QtWidgets.QFrame):
         if not self.btn_action_menu.isVisible():
             self.btn_action_menu.setVisible(True)
             self.btn_action_menu.clicked.connect(self.show_actions)
-            self.action_menu.setStyleSheet(style.load_stylesheet())
 
     def set_repre_name_valid(self, valid):
         self.has_valid_repre = valid
diff --git a/openpype/tools/standalonepublish/widgets/widget_drop_frame.py b/openpype/tools/standalonepublish/widgets/widget_drop_frame.py
index 63dcb82e83..7fe43c4203 100644
--- a/openpype/tools/standalonepublish/widgets/widget_drop_frame.py
+++ b/openpype/tools/standalonepublish/widgets/widget_drop_frame.py
@@ -211,7 +211,8 @@ class DropDataFrame(QtWidgets.QFrame):
         folder_path = os.path.dirname(collection.head)
         if file_base[-1] in ['.', '_']:
             file_base = file_base[:-1]
-        file_ext = collection.tail
+        file_ext = os.path.splitext(
+            collection.format('{head}{padding}{tail}'))[1]
         repr_name = file_ext.replace('.', '')
         range = collection.format('{ranges}')
 
diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py
index d567e26d74..42f0e422ae 100644
--- a/openpype/tools/workfiles/app.py
+++ b/openpype/tools/workfiles/app.py
@@ -693,16 +693,16 @@ class FilesWidget(QtWidgets.QWidget):
                 )
                 return
 
-        file_path = os.path.join(self.root, work_file)
+        file_path = os.path.join(os.path.normpath(self.root), work_file)
 
-        pipeline.emit("before.workfile.save", file_path)
+        pipeline.emit("before.workfile.save", [file_path])
 
         self._enter_session()   # Make sure we are in the right session
         self.host.save_file(file_path)
 
         self.set_asset_task(self._asset, self._task)
 
-        pipeline.emit("after.workfile.save", file_path)
+        pipeline.emit("after.workfile.save", [file_path])
 
         self.workfile_created.emit(file_path)
 
diff --git a/openpype/vendor/python/common/scriptsmenu/__init__.py b/openpype/vendor/python/common/scriptsmenu/__init__.py
new file mode 100644
index 0000000000..a881f73533
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/__init__.py
@@ -0,0 +1,5 @@
+from .scriptsmenu import ScriptsMenu
+from . import version
+
+__all__ = ["ScriptsMenu"]
+__version__ = version.version
diff --git a/openpype/vendor/python/common/scriptsmenu/action.py b/openpype/vendor/python/common/scriptsmenu/action.py
new file mode 100644
index 0000000000..dc4d775f6a
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/action.py
@@ -0,0 +1,207 @@
+import os
+
+from .vendor.Qt import QtWidgets
+
+
+class Action(QtWidgets.QAction):
+    """Custom Action widget"""
+
+    def __init__(self, parent=None):
+
+        QtWidgets.QAction.__init__(self, parent)
+
+        self._root = None
+        self._tags = list()
+        self._command = None
+        self._sourcetype = None
+        self._iconfile = None
+        self._label = None
+
+        self._COMMAND = """import imp
+f, filepath, descr = imp.find_module('{module_name}', ['{dirname}'])
+module = imp.load_module('{module_name}', f, filepath, descr)
+module.{module_name}()"""
+
+    @property
+    def root(self):
+        return self._root
+
+    @root.setter
+    def root(self, value):
+        self._root = value
+
+    @property
+    def tags(self):
+        return self._tags
+
+    @tags.setter
+    def tags(self, value):
+        self._tags = value
+
+    @property
+    def command(self):
+        return self._command
+
+    @command.setter
+    def command(self, value):
+        """
+        Store the command in the QAction 
+
+        Args:
+            value (str): the full command which will be executed when clicked
+        
+        Return:
+             None
+        """
+        self._command = value
+
+    @property
+    def sourcetype(self):
+        return self._sourcetype
+
+    @sourcetype.setter
+    def sourcetype(self, value):
+        """
+        Set the command type to get the correct execution of the command given
+
+        Args:
+            value (str): the name of the command type
+        
+        Returns:
+            None
+
+        """
+        self._sourcetype = value
+
+    @property
+    def iconfile(self):
+        return self._iconfile
+
+    @iconfile.setter
+    def iconfile(self, value):
+        """Store the path to the image file which needs to be displayed
+
+        Args:
+            value (str): the path to the image
+
+        Returns:
+            None
+        """
+        self._iconfile = value
+
+    @property
+    def label(self):
+        return self._label
+
+    @label.setter
+    def label(self, value):
+        """
+        Set the abbreviation which will be used as overlay text in the shelf
+
+        Args:
+            value (str): an abbreviation of the name
+        
+        Returns:
+            None
+
+        """
+        self._label = value
+
+    def run_command(self):
+        """
+        Run the command of the instance or copy the command to the active shelf
+        based on the current modifiers.
+
+        If callbacks have been registered with fouind modifier integer the
+        function will trigger all callbacks. When a callback function returns a
+        non zero integer it will not execute the action's command
+
+        """
+
+        # get the current application and its linked keyboard modifiers
+        modifiers = QtWidgets.QApplication.keyboardModifiers()
+
+        # If the menu has a callback registered for the current modifier
+        # we run the callback instead of the action itself.
+        registered = self._root.registered_callbacks
+        callbacks = registered.get(int(modifiers), [])
+        for callback in callbacks:
+            signal = callback(self)
+            if signal != 0:
+                # Exit function on non-zero return code
+                return
+
+        exec(self.process_command())
+
+    def process_command(self):
+        """
+        Check if the command is a file which needs to be launched and if it 
+        has a relative path, if so return the full path by expanding 
+        environment variables. Wrap any mel command in a executable string 
+        for Python and return the string if the source type is  
+        
+        Add your own source type and required process to ensure callback
+        is stored correctly.
+        
+        An example of a process is the sourcetype is MEL 
+        (Maya Embedded Language) as Python cannot run it on its own so it 
+        needs to be wrapped in a string in which we explicitly import mel and 
+        run it as a mel.eval. The string is then parsed to python as 
+        exec("command"). 
+
+        Returns:
+            str: a clean command which can be used
+
+        """
+        if self._sourcetype == "python":
+            return self._command
+
+        if self._sourcetype == "mel":
+            # Escape single quotes
+            conversion = self._command.replace("'", "\\'")
+            return "import maya; maya.mel.eval('{}')".format(conversion)
+
+        if self._sourcetype == "file":
+            if os.path.isabs(self._command):
+                filepath = self._command
+            else:
+                filepath = os.path.normpath(os.path.expandvars(self._command))
+
+            return self._wrap_filepath(filepath)
+
+    def has_tag(self, tag):
+        """Check whether the tag matches with the action's tags.
+        
+        A partial match will also return True, for example tag `a` will match
+        correctly with the `ape` tag on the Action.
+
+        Args:
+            tag (str): The tag
+        
+        Returns
+            bool: Whether the action is tagged with given tag
+        
+        """
+
+        for tagitem in self.tags:
+            if tag not in tagitem:
+                continue
+            return True
+
+        return False
+
+    def _wrap_filepath(self, file_path):
+        """Create a wrapped string for the python command
+
+        Args:
+            file_path (str): the filepath of a script
+
+        Returns:
+            str: the wrapped command
+        """
+
+        dirname = os.path.dirname(r"{}".format(file_path))
+        dirpath = dirname.replace("\\", "/")
+        module_name = os.path.splitext(os.path.basename(file_path))[0]
+
+        return self._COMMAND.format(module_name=module_name, dirname=dirpath)
diff --git a/openpype/vendor/python/common/scriptsmenu/launchformari.py b/openpype/vendor/python/common/scriptsmenu/launchformari.py
new file mode 100644
index 0000000000..25cfc80d96
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/launchformari.py
@@ -0,0 +1,54 @@
+
+# Import third-party modules
+from vendor.Qt import QtWidgets
+
+# Import local modules
+import scriptsmenu
+
+
+def _mari_main_window():
+    """Get Mari main window.
+
+    Returns:
+        MriMainWindow: Mari's main window.
+
+    """
+    for obj in QtWidgets.QApplication.topLevelWidgets():
+        if obj.metaObject().className() == 'MriMainWindow':
+            return obj
+    raise RuntimeError('Could not find Mari MainWindow instance')
+
+
+def _mari_main_menubar():
+    """Get Mari main menu bar.
+
+    Returns:
+        Retrieve the main menubar of the Mari window.
+
+    """
+    mari_window = _mari_main_window()
+    menubar = [
+        i for i in mari_window.children() if isinstance(i, QtWidgets.QMenuBar)
+    ]
+    assert len(menubar) == 1, "Error, could not find menu bar!"
+    return menubar[0]
+
+
+def main(title="Scripts"):
+    """Build the main scripts menu in Mari.
+
+    Args:
+        title (str): Name of the menu in the application.
+
+    Returns:
+        scriptsmenu.ScriptsMenu:  Instance object.
+
+    """
+    mari_main_bar = _mari_main_menubar()
+    for mari_bar in mari_main_bar.children():
+        if isinstance(mari_bar, scriptsmenu.ScriptsMenu):
+            if mari_bar.title() == title:
+                menu = mari_bar
+                return menu
+    menu = scriptsmenu.ScriptsMenu(title=title, parent=mari_main_bar)
+    return menu
diff --git a/openpype/vendor/python/common/scriptsmenu/launchformaya.py b/openpype/vendor/python/common/scriptsmenu/launchformaya.py
new file mode 100644
index 0000000000..7ad66f0ad2
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/launchformaya.py
@@ -0,0 +1,137 @@
+import logging
+
+import maya.cmds as cmds
+import maya.mel as mel
+
+import scriptsmenu
+from .vendor.Qt import QtCore, QtWidgets
+
+log = logging.getLogger(__name__)
+
+
+def register_repeat_last(action):
+    """Register the action in repeatLast to ensure the RepeatLast hotkey works
+
+    Args:
+        action (action.Action): Action wigdet instance
+
+    Returns:
+        int: 0
+
+    """
+    command = action.process_command()
+    command = command.replace("\n", "; ")
+    # Register command to Maya (mel)
+    cmds.repeatLast(addCommand='python("{}")'.format(command),
+                    addCommandLabel=action.label)
+
+    return 0
+
+
+def to_shelf(action):
+    """Copy clicked menu item to the currently active Maya shelf
+    Args:
+        action (action.Action): the action instance which is clicked
+
+    Returns:
+        int: 1
+
+    """
+
+    shelftoplevel = mel.eval("$gShelfTopLevel = $gShelfTopLevel;")
+    current_active_shelf = cmds.tabLayout(shelftoplevel,
+                                          query=True,
+                                          selectTab=True)
+
+    cmds.shelfButton(command=action.process_command(),
+                     sourceType="python",
+                     parent=current_active_shelf,
+                     image=action.iconfile or "pythonFamily.png",
+                     annotation=action.statusTip(),
+                     imageOverlayLabel=action.label or "")
+
+    return 1
+
+
+def _maya_main_window():
+    """Return Maya's main window"""
+    for obj in QtWidgets.QApplication.topLevelWidgets():
+        if obj.objectName() == 'MayaWindow':
+            return obj
+    raise RuntimeError('Could not find MayaWindow instance')
+
+
+def _maya_main_menubar():
+    """Retrieve the main menubar of the Maya window"""
+    mayawindow = _maya_main_window()
+    menubar = [i for i in mayawindow.children()
+               if isinstance(i, QtWidgets.QMenuBar)]
+
+    assert len(menubar) == 1, "Error, could not find menu bar!"
+
+    return menubar[0]
+
+
+def find_scripts_menu(title, parent):
+    """
+    Check if the menu exists with the given title in the parent
+
+    Args:
+        title (str): the title name of the scripts menu
+
+        parent (QtWidgets.QMenuBar): the menubar to check
+
+    Returns:
+        QtWidgets.QMenu or None
+
+    """
+
+    menu = None
+    search = [i for i in parent.children() if
+              isinstance(i, scriptsmenu.ScriptsMenu)
+              and i.title() == title]
+
+    if search:
+        assert len(search) < 2, ("Multiple instances of menu '{}' "
+                                 "in menu bar".format(title))
+        menu = search[0]
+
+    return menu
+
+
+def main(title="Scripts", parent=None, objectName=None):
+    """Build the main scripts menu in Maya
+
+    Args:
+        title (str): name of the menu in the application
+
+        parent (QtWidgets.QtMenuBar): the parent object for the menu
+
+        objectName (str): custom objectName for scripts menu
+
+    Returns:
+        scriptsmenu.ScriptsMenu instance
+
+    """
+
+    mayamainbar = parent or _maya_main_menubar()
+    try:
+        # check menu already exists
+        menu = find_scripts_menu(title, mayamainbar)
+        if not menu:
+            log.info("Attempting to build menu ...")
+            object_name = objectName or title.lower()
+            menu = scriptsmenu.ScriptsMenu(title=title,
+                                           parent=mayamainbar,
+                                           objectName=object_name)
+    except Exception as e:
+        log.error(e)
+        return
+
+    # Register control + shift callback to add to shelf (maya behavior)
+    modifiers = QtCore.Qt.ControlModifier | QtCore.Qt.ShiftModifier
+    menu.register_callback(int(modifiers), to_shelf)
+
+    menu.register_callback(0, register_repeat_last)
+
+    return menu
diff --git a/openpype/vendor/python/common/scriptsmenu/launchfornuke.py b/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
new file mode 100644
index 0000000000..23e4ed1b4d
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
@@ -0,0 +1,36 @@
+import scriptsmenu
+from .vendor.Qt import QtWidgets
+
+
+def _nuke_main_window():
+    """Return Nuke's main window"""
+    for obj in QtWidgets.QApplication.topLevelWidgets():
+        if (obj.inherits('QMainWindow') and
+                    obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
+            return obj
+        raise RuntimeError('Could not find Nuke MainWindow instance')
+
+
+def _nuke_main_menubar():
+    """Retrieve the main menubar of the Nuke window"""
+    nuke_window = _nuke_main_window()
+    menubar = [i for i in nuke_window.children()
+               if isinstance(i, QtWidgets.QMenuBar)]
+
+    assert len(menubar) == 1, "Error, could not find menu bar!"
+    return menubar[0]
+
+
+def main(title="Scripts"):
+    # Register control + shift callback to add to shelf (Nuke behavior)
+    # modifiers = QtCore.Qt.ControlModifier | QtCore.Qt.ShiftModifier
+    # menu.register_callback(modifiers, to_shelf)
+    nuke_main_bar = _nuke_main_menubar()
+    for nuke_bar in nuke_main_bar.children():
+        if isinstance(nuke_bar, scriptsmenu.ScriptsMenu):
+            if nuke_bar.title() == title:
+                menu = nuke_bar
+                return menu
+
+    menu = scriptsmenu.ScriptsMenu(title=title, parent=nuke_main_bar)
+    return menu
\ No newline at end of file
diff --git a/openpype/vendor/python/common/scriptsmenu/scriptsmenu.py b/openpype/vendor/python/common/scriptsmenu/scriptsmenu.py
new file mode 100644
index 0000000000..e2b7ff96c7
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/scriptsmenu.py
@@ -0,0 +1,316 @@
+import os
+import json
+import logging
+from collections import defaultdict
+
+from .vendor.Qt import QtWidgets, QtCore
+from . import action
+
+log = logging.getLogger(__name__)
+
+
+class ScriptsMenu(QtWidgets.QMenu):
+    """A Qt menu that displays a list of searchable actions"""
+
+    updated = QtCore.Signal(QtWidgets.QMenu)
+
+    def __init__(self, *args, **kwargs):
+        """Initialize Scripts menu
+
+        Args:
+            title (str): the name of the root menu which will be created
+        
+            parent (QtWidgets.QObject) : the QObject to parent the menu to
+        
+        Returns:
+            None
+
+        """
+        QtWidgets.QMenu.__init__(self, *args, **kwargs)
+
+        self.searchbar = None
+        self.update_action = None
+
+        self._script_actions = []
+        self._callbacks = defaultdict(list)
+
+        # Automatically add it to the parent menu
+        parent = kwargs.get("parent", None)
+        if parent:
+            parent.addMenu(self)
+
+        objectname = kwargs.get("objectName", "scripts")
+        title = kwargs.get("title", "Scripts")
+        self.setObjectName(objectname)
+        self.setTitle(title)
+
+        # add default items in the menu
+        self.create_default_items()
+
+    def on_update(self):
+        self.updated.emit(self)
+
+    @property
+    def registered_callbacks(self):
+        return self._callbacks.copy()
+
+    def create_default_items(self):
+        """Add a search bar to the top of the menu given"""
+
+        # create widget and link function
+        searchbar = QtWidgets.QLineEdit()
+        searchbar.setFixedWidth(120)
+        searchbar.setPlaceholderText("Search ...")
+        searchbar.textChanged.connect(self._update_search)
+        self.searchbar = searchbar
+
+        # create widget holder
+        searchbar_action = QtWidgets.QWidgetAction(self)
+
+        # add widget to widget holder
+        searchbar_action.setDefaultWidget(self.searchbar)
+        searchbar_action.setObjectName("Searchbar")
+
+        # add update button and link function
+        update_action = QtWidgets.QAction(self)
+        update_action.setObjectName("Update Scripts")
+        update_action.setText("Update Scripts")
+        update_action.setVisible(False)
+        update_action.triggered.connect(self.on_update)
+        self.update_action = update_action
+
+        # add action to menu
+        self.addAction(searchbar_action)
+        self.addAction(update_action)
+
+        # add separator object
+        separator = self.addSeparator()
+        separator.setObjectName("separator")
+
+    def add_menu(self, title, parent=None):
+        """Create a sub menu for a parent widget
+
+        Args:
+            parent(QtWidgets.QWidget): the object to parent the menu to
+
+            title(str): the title of the menu
+        
+        Returns:
+             QtWidget.QMenu instance
+        """
+
+        if not parent:
+            parent = self
+
+        menu = QtWidgets.QMenu(parent, title)
+        menu.setTitle(title)
+        menu.setObjectName(title)
+        menu.setTearOffEnabled(True)
+        parent.addMenu(menu)
+
+        return menu
+
+    def add_script(self, parent, title, command, sourcetype, icon=None,
+                   tags=None, label=None, tooltip=None):
+        """Create an action item which runs a script when clicked
+
+        Args:
+            parent (QtWidget.QWidget): The widget to parent the item to
+
+            title (str): The text which will be displayed in the menu
+
+            command (str): The command which needs to be run when the item is
+                           clicked.
+
+            sourcetype (str): The type of command, the way the command is
+                              processed is based on the source type.
+
+            icon (str): The file path of an icon to display with the menu item
+
+            tags (list, tuple): Keywords which describe the action
+
+            label (str): A short description of the script which will be displayed
+                         when hovering over the menu item
+
+            tooltip (str): A tip for the user about the usage fo the tool
+
+        Returns:
+            QtWidget.QAction instance
+
+        """
+
+        assert tags is None or isinstance(tags, (list, tuple))
+        # Ensure tags is a list
+        tags = list() if tags is None else list(tags)
+        tags.append(title.lower())
+
+        assert icon is None or isinstance(icon, str), (
+            "Invalid data type for icon, supported : None, string")
+
+        # create new action
+        script_action = action.Action(parent)
+        script_action.setText(title)
+        script_action.setObjectName(title)
+        script_action.tags = tags
+
+        # link action to root for callback library
+        script_action.root = self
+
+        # Set up the command
+        script_action.sourcetype = sourcetype
+        script_action.command = command
+
+        try:
+            script_action.process_command()
+        except RuntimeError as e:
+            raise RuntimeError("Script action can't be "
+                               "processed: {}".format(e))
+
+        if icon:
+            iconfile = os.path.expandvars(icon)
+            script_action.iconfile = iconfile
+            script_action_icon = QtWidgets.QIcon(iconfile)
+            script_action.setIcon(script_action_icon)
+
+        if label:
+            script_action.label = label
+
+        if tooltip:
+            script_action.setStatusTip(tooltip)
+
+        script_action.triggered.connect(script_action.run_command)
+        parent.addAction(script_action)
+
+        # Add to our searchable actions
+        self._script_actions.append(script_action)
+
+        return script_action
+
+    def build_from_configuration(self, parent, configuration):
+        """Process the configurations and store the configuration
+
+        This creates all submenus from a configuration.json file.
+
+        When the configuration holds the key `main` all scripts under `main` will
+        be added to the main menu first before adding the rest
+
+        Args:
+            parent (ScriptsMenu): script menu instance
+            configuration (list): A ScriptsMenu configuration list
+
+        Returns:
+            None
+
+        """
+
+        for item in configuration:
+            assert isinstance(item, dict), "Configuration is wrong!"
+
+            # skip items which have no `type` key
+            item_type = item.get('type', None)
+            if not item_type:
+                log.warning("Missing 'type' from configuration item")
+                continue
+
+            # add separator
+            # Special behavior for separators
+            if item_type == "separator":
+                parent.addSeparator()
+
+            # add submenu
+            # items should hold a collection of submenu items (dict)
+            elif item_type == "menu":
+                assert "items" in item, "Menu is missing 'items' key"
+                menu = self.add_menu(parent=parent, title=item["title"])
+                self.build_from_configuration(menu, item["items"])
+
+            # add script
+            elif item_type == "action":
+                # filter out `type` from the item dict
+                config = {key: value for key, value in
+                          item.items() if key != "type"}
+
+                self.add_script(parent=parent, **config)
+
+    def set_update_visible(self, state):
+        self.update_action.setVisible(state)
+
+    def clear_menu(self):
+        """Clear all menu items which are not default
+
+        Returns:
+            None
+
+        """
+
+        # TODO: Set up a more robust implementation for this
+        # Delete all except the first three actions
+        for _action in self.actions()[3:]:
+            self.removeAction(_action)
+
+    def register_callback(self, modifiers, callback):
+        self._callbacks[modifiers].append(callback)
+
+    def _update_search(self, search):
+        """Hide all the samples which do not match the user's import
+        
+        Returns:
+            None
+
+        """
+
+        if not search:
+            for action in self._script_actions:
+                action.setVisible(True)
+        else:
+            for action in self._script_actions:
+                if not action.has_tag(search.lower()):
+                    action.setVisible(False)
+
+        # Set visibility for all submenus
+        for action in self.actions():
+            if not action.menu():
+                continue
+
+            menu = action.menu()
+            visible = any(action.isVisible() for action in menu.actions())
+            action.setVisible(visible)
+
+
+def load_configuration(path):
+    """Load the configuration from a file
+
+    Read out the JSON file which will dictate the structure of the scripts menu
+
+    Args:
+        path (str): file path of the .JSON file
+
+    Returns:
+        dict
+
+    """
+
+    if not os.path.isfile(path):
+        raise AttributeError("Given configuration is not "
+                             "a file!\n'{}'".format(path))
+
+    extension = os.path.splitext(path)[-1]
+    if extension != ".json":
+        raise AttributeError("Given configuration file has unsupported "
+                             "file type, provide a .json file")
+
+    # retrieve and store config
+    with open(path, "r") as f:
+        configuration = json.load(f)
+
+    return configuration
+
+
+def application(configuration, parent):
+    import sys
+    app = QtWidgets.QApplication(sys.argv)
+
+    scriptsmenu = ScriptsMenu(configuration, parent)
+    scriptsmenu.show()
+
+    sys.exit(app.exec_())
diff --git a/openpype/vendor/python/common/scriptsmenu/vendor/Qt.py b/openpype/vendor/python/common/scriptsmenu/vendor/Qt.py
new file mode 100644
index 0000000000..fe4b45f18f
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/vendor/Qt.py
@@ -0,0 +1,1989 @@
+"""Minimal Python 2 & 3 shim around all Qt bindings
+
+DOCUMENTATION
+    Qt.py was born in the film and visual effects industry to address
+    the growing need for the development of software capable of running
+    with more than one flavour of the Qt bindings for Python - PySide,
+    PySide2, PyQt4 and PyQt5.
+
+    1. Build for one, run with all
+    2. Explicit is better than implicit
+    3. Support co-existence
+
+    Default resolution order:
+        - PySide2
+        - PyQt5
+        - PySide
+        - PyQt4
+
+    Usage:
+        >> import sys
+        >> from Qt import QtWidgets
+        >> app = QtWidgets.QApplication(sys.argv)
+        >> button = QtWidgets.QPushButton("Hello World")
+        >> button.show()
+        >> app.exec_()
+
+    All members of PySide2 are mapped from other bindings, should they exist.
+    If no equivalent member exist, it is excluded from Qt.py and inaccessible.
+    The idea is to highlight members that exist across all supported binding,
+    and guarantee that code that runs on one binding runs on all others.
+
+    For more details, visit https://github.com/mottosso/Qt.py
+
+LICENSE
+
+    See end of file for license (MIT, BSD) information.
+
+"""
+
+import os
+import sys
+import types
+import shutil
+import importlib
+
+
+__version__ = "1.2.3"
+
+# Enable support for `from Qt import *`
+__all__ = []
+
+# Flags from environment variables
+QT_VERBOSE = bool(os.getenv("QT_VERBOSE"))
+QT_PREFERRED_BINDING = os.getenv("QT_PREFERRED_BINDING", "")
+QT_SIP_API_HINT = os.getenv("QT_SIP_API_HINT")
+
+# Reference to Qt.py
+Qt = sys.modules[__name__]
+Qt.QtCompat = types.ModuleType("QtCompat")
+
+try:
+    long
+except NameError:
+    # Python 3 compatibility
+    long = int
+
+
+"""Common members of all bindings
+
+This is where each member of Qt.py is explicitly defined.
+It is based on a "lowest common denominator" of all bindings;
+including members found in each of the 4 bindings.
+
+The "_common_members" dictionary is generated using the
+build_membership.sh script.
+
+"""
+
+_common_members = {
+    "QtCore": [
+        "QAbstractAnimation",
+        "QAbstractEventDispatcher",
+        "QAbstractItemModel",
+        "QAbstractListModel",
+        "QAbstractState",
+        "QAbstractTableModel",
+        "QAbstractTransition",
+        "QAnimationGroup",
+        "QBasicTimer",
+        "QBitArray",
+        "QBuffer",
+        "QByteArray",
+        "QByteArrayMatcher",
+        "QChildEvent",
+        "QCoreApplication",
+        "QCryptographicHash",
+        "QDataStream",
+        "QDate",
+        "QDateTime",
+        "QDir",
+        "QDirIterator",
+        "QDynamicPropertyChangeEvent",
+        "QEasingCurve",
+        "QElapsedTimer",
+        "QEvent",
+        "QEventLoop",
+        "QEventTransition",
+        "QFile",
+        "QFileInfo",
+        "QFileSystemWatcher",
+        "QFinalState",
+        "QGenericArgument",
+        "QGenericReturnArgument",
+        "QHistoryState",
+        "QItemSelectionRange",
+        "QIODevice",
+        "QLibraryInfo",
+        "QLine",
+        "QLineF",
+        "QLocale",
+        "QMargins",
+        "QMetaClassInfo",
+        "QMetaEnum",
+        "QMetaMethod",
+        "QMetaObject",
+        "QMetaProperty",
+        "QMimeData",
+        "QModelIndex",
+        "QMutex",
+        "QMutexLocker",
+        "QObject",
+        "QParallelAnimationGroup",
+        "QPauseAnimation",
+        "QPersistentModelIndex",
+        "QPluginLoader",
+        "QPoint",
+        "QPointF",
+        "QProcess",
+        "QProcessEnvironment",
+        "QPropertyAnimation",
+        "QReadLocker",
+        "QReadWriteLock",
+        "QRect",
+        "QRectF",
+        "QRegExp",
+        "QResource",
+        "QRunnable",
+        "QSemaphore",
+        "QSequentialAnimationGroup",
+        "QSettings",
+        "QSignalMapper",
+        "QSignalTransition",
+        "QSize",
+        "QSizeF",
+        "QSocketNotifier",
+        "QState",
+        "QStateMachine",
+        "QSysInfo",
+        "QSystemSemaphore",
+        "QT_TRANSLATE_NOOP",
+        "QT_TR_NOOP",
+        "QT_TR_NOOP_UTF8",
+        "QTemporaryFile",
+        "QTextBoundaryFinder",
+        "QTextCodec",
+        "QTextDecoder",
+        "QTextEncoder",
+        "QTextStream",
+        "QTextStreamManipulator",
+        "QThread",
+        "QThreadPool",
+        "QTime",
+        "QTimeLine",
+        "QTimer",
+        "QTimerEvent",
+        "QTranslator",
+        "QUrl",
+        "QVariantAnimation",
+        "QWaitCondition",
+        "QWriteLocker",
+        "QXmlStreamAttribute",
+        "QXmlStreamAttributes",
+        "QXmlStreamEntityDeclaration",
+        "QXmlStreamEntityResolver",
+        "QXmlStreamNamespaceDeclaration",
+        "QXmlStreamNotationDeclaration",
+        "QXmlStreamReader",
+        "QXmlStreamWriter",
+        "Qt",
+        "QtCriticalMsg",
+        "QtDebugMsg",
+        "QtFatalMsg",
+        "QtMsgType",
+        "QtSystemMsg",
+        "QtWarningMsg",
+        "qAbs",
+        "qAddPostRoutine",
+        "qChecksum",
+        "qCritical",
+        "qDebug",
+        "qFatal",
+        "qFuzzyCompare",
+        "qIsFinite",
+        "qIsInf",
+        "qIsNaN",
+        "qIsNull",
+        "qRegisterResourceData",
+        "qUnregisterResourceData",
+        "qVersion",
+        "qWarning",
+        "qrand",
+        "qsrand"
+    ],
+    "QtGui": [
+        "QAbstractTextDocumentLayout",
+        "QActionEvent",
+        "QBitmap",
+        "QBrush",
+        "QClipboard",
+        "QCloseEvent",
+        "QColor",
+        "QConicalGradient",
+        "QContextMenuEvent",
+        "QCursor",
+        "QDesktopServices",
+        "QDoubleValidator",
+        "QDrag",
+        "QDragEnterEvent",
+        "QDragLeaveEvent",
+        "QDragMoveEvent",
+        "QDropEvent",
+        "QFileOpenEvent",
+        "QFocusEvent",
+        "QFont",
+        "QFontDatabase",
+        "QFontInfo",
+        "QFontMetrics",
+        "QFontMetricsF",
+        "QGradient",
+        "QHelpEvent",
+        "QHideEvent",
+        "QHoverEvent",
+        "QIcon",
+        "QIconDragEvent",
+        "QIconEngine",
+        "QImage",
+        "QImageIOHandler",
+        "QImageReader",
+        "QImageWriter",
+        "QInputEvent",
+        "QInputMethodEvent",
+        "QIntValidator",
+        "QKeyEvent",
+        "QKeySequence",
+        "QLinearGradient",
+        "QMatrix2x2",
+        "QMatrix2x3",
+        "QMatrix2x4",
+        "QMatrix3x2",
+        "QMatrix3x3",
+        "QMatrix3x4",
+        "QMatrix4x2",
+        "QMatrix4x3",
+        "QMatrix4x4",
+        "QMouseEvent",
+        "QMoveEvent",
+        "QMovie",
+        "QPaintDevice",
+        "QPaintEngine",
+        "QPaintEngineState",
+        "QPaintEvent",
+        "QPainter",
+        "QPainterPath",
+        "QPainterPathStroker",
+        "QPalette",
+        "QPen",
+        "QPicture",
+        "QPictureIO",
+        "QPixmap",
+        "QPixmapCache",
+        "QPolygon",
+        "QPolygonF",
+        "QQuaternion",
+        "QRadialGradient",
+        "QRegExpValidator",
+        "QRegion",
+        "QResizeEvent",
+        "QSessionManager",
+        "QShortcutEvent",
+        "QShowEvent",
+        "QStandardItem",
+        "QStandardItemModel",
+        "QStatusTipEvent",
+        "QSyntaxHighlighter",
+        "QTabletEvent",
+        "QTextBlock",
+        "QTextBlockFormat",
+        "QTextBlockGroup",
+        "QTextBlockUserData",
+        "QTextCharFormat",
+        "QTextCursor",
+        "QTextDocument",
+        "QTextDocumentFragment",
+        "QTextFormat",
+        "QTextFragment",
+        "QTextFrame",
+        "QTextFrameFormat",
+        "QTextImageFormat",
+        "QTextInlineObject",
+        "QTextItem",
+        "QTextLayout",
+        "QTextLength",
+        "QTextLine",
+        "QTextList",
+        "QTextListFormat",
+        "QTextObject",
+        "QTextObjectInterface",
+        "QTextOption",
+        "QTextTable",
+        "QTextTableCell",
+        "QTextTableCellFormat",
+        "QTextTableFormat",
+        "QTouchEvent",
+        "QTransform",
+        "QValidator",
+        "QVector2D",
+        "QVector3D",
+        "QVector4D",
+        "QWhatsThisClickedEvent",
+        "QWheelEvent",
+        "QWindowStateChangeEvent",
+        "qAlpha",
+        "qBlue",
+        "qGray",
+        "qGreen",
+        "qIsGray",
+        "qRed",
+        "qRgb",
+        "qRgba"
+    ],
+    "QtHelp": [
+        "QHelpContentItem",
+        "QHelpContentModel",
+        "QHelpContentWidget",
+        "QHelpEngine",
+        "QHelpEngineCore",
+        "QHelpIndexModel",
+        "QHelpIndexWidget",
+        "QHelpSearchEngine",
+        "QHelpSearchQuery",
+        "QHelpSearchQueryWidget",
+        "QHelpSearchResultWidget"
+    ],
+    "QtMultimedia": [
+        "QAbstractVideoBuffer",
+        "QAbstractVideoSurface",
+        "QAudio",
+        "QAudioDeviceInfo",
+        "QAudioFormat",
+        "QAudioInput",
+        "QAudioOutput",
+        "QVideoFrame",
+        "QVideoSurfaceFormat"
+    ],
+    "QtNetwork": [
+        "QAbstractNetworkCache",
+        "QAbstractSocket",
+        "QAuthenticator",
+        "QHostAddress",
+        "QHostInfo",
+        "QLocalServer",
+        "QLocalSocket",
+        "QNetworkAccessManager",
+        "QNetworkAddressEntry",
+        "QNetworkCacheMetaData",
+        "QNetworkConfiguration",
+        "QNetworkConfigurationManager",
+        "QNetworkCookie",
+        "QNetworkCookieJar",
+        "QNetworkDiskCache",
+        "QNetworkInterface",
+        "QNetworkProxy",
+        "QNetworkProxyFactory",
+        "QNetworkProxyQuery",
+        "QNetworkReply",
+        "QNetworkRequest",
+        "QNetworkSession",
+        "QSsl",
+        "QTcpServer",
+        "QTcpSocket",
+        "QUdpSocket"
+    ],
+    "QtOpenGL": [
+        "QGL",
+        "QGLContext",
+        "QGLFormat",
+        "QGLWidget"
+    ],
+    "QtPrintSupport": [
+        "QAbstractPrintDialog",
+        "QPageSetupDialog",
+        "QPrintDialog",
+        "QPrintEngine",
+        "QPrintPreviewDialog",
+        "QPrintPreviewWidget",
+        "QPrinter",
+        "QPrinterInfo"
+    ],
+    "QtSql": [
+        "QSql",
+        "QSqlDatabase",
+        "QSqlDriver",
+        "QSqlDriverCreatorBase",
+        "QSqlError",
+        "QSqlField",
+        "QSqlIndex",
+        "QSqlQuery",
+        "QSqlQueryModel",
+        "QSqlRecord",
+        "QSqlRelation",
+        "QSqlRelationalDelegate",
+        "QSqlRelationalTableModel",
+        "QSqlResult",
+        "QSqlTableModel"
+    ],
+    "QtSvg": [
+        "QGraphicsSvgItem",
+        "QSvgGenerator",
+        "QSvgRenderer",
+        "QSvgWidget"
+    ],
+    "QtTest": [
+        "QTest"
+    ],
+    "QtWidgets": [
+        "QAbstractButton",
+        "QAbstractGraphicsShapeItem",
+        "QAbstractItemDelegate",
+        "QAbstractItemView",
+        "QAbstractScrollArea",
+        "QAbstractSlider",
+        "QAbstractSpinBox",
+        "QAction",
+        "QActionGroup",
+        "QApplication",
+        "QBoxLayout",
+        "QButtonGroup",
+        "QCalendarWidget",
+        "QCheckBox",
+        "QColorDialog",
+        "QColumnView",
+        "QComboBox",
+        "QCommandLinkButton",
+        "QCommonStyle",
+        "QCompleter",
+        "QDataWidgetMapper",
+        "QDateEdit",
+        "QDateTimeEdit",
+        "QDesktopWidget",
+        "QDial",
+        "QDialog",
+        "QDialogButtonBox",
+        "QDirModel",
+        "QDockWidget",
+        "QDoubleSpinBox",
+        "QErrorMessage",
+        "QFileDialog",
+        "QFileIconProvider",
+        "QFileSystemModel",
+        "QFocusFrame",
+        "QFontComboBox",
+        "QFontDialog",
+        "QFormLayout",
+        "QFrame",
+        "QGesture",
+        "QGestureEvent",
+        "QGestureRecognizer",
+        "QGraphicsAnchor",
+        "QGraphicsAnchorLayout",
+        "QGraphicsBlurEffect",
+        "QGraphicsColorizeEffect",
+        "QGraphicsDropShadowEffect",
+        "QGraphicsEffect",
+        "QGraphicsEllipseItem",
+        "QGraphicsGridLayout",
+        "QGraphicsItem",
+        "QGraphicsItemGroup",
+        "QGraphicsLayout",
+        "QGraphicsLayoutItem",
+        "QGraphicsLineItem",
+        "QGraphicsLinearLayout",
+        "QGraphicsObject",
+        "QGraphicsOpacityEffect",
+        "QGraphicsPathItem",
+        "QGraphicsPixmapItem",
+        "QGraphicsPolygonItem",
+        "QGraphicsProxyWidget",
+        "QGraphicsRectItem",
+        "QGraphicsRotation",
+        "QGraphicsScale",
+        "QGraphicsScene",
+        "QGraphicsSceneContextMenuEvent",
+        "QGraphicsSceneDragDropEvent",
+        "QGraphicsSceneEvent",
+        "QGraphicsSceneHelpEvent",
+        "QGraphicsSceneHoverEvent",
+        "QGraphicsSceneMouseEvent",
+        "QGraphicsSceneMoveEvent",
+        "QGraphicsSceneResizeEvent",
+        "QGraphicsSceneWheelEvent",
+        "QGraphicsSimpleTextItem",
+        "QGraphicsTextItem",
+        "QGraphicsTransform",
+        "QGraphicsView",
+        "QGraphicsWidget",
+        "QGridLayout",
+        "QGroupBox",
+        "QHBoxLayout",
+        "QHeaderView",
+        "QInputDialog",
+        "QItemDelegate",
+        "QItemEditorCreatorBase",
+        "QItemEditorFactory",
+        "QKeyEventTransition",
+        "QLCDNumber",
+        "QLabel",
+        "QLayout",
+        "QLayoutItem",
+        "QLineEdit",
+        "QListView",
+        "QListWidget",
+        "QListWidgetItem",
+        "QMainWindow",
+        "QMdiArea",
+        "QMdiSubWindow",
+        "QMenu",
+        "QMenuBar",
+        "QMessageBox",
+        "QMouseEventTransition",
+        "QPanGesture",
+        "QPinchGesture",
+        "QPlainTextDocumentLayout",
+        "QPlainTextEdit",
+        "QProgressBar",
+        "QProgressDialog",
+        "QPushButton",
+        "QRadioButton",
+        "QRubberBand",
+        "QScrollArea",
+        "QScrollBar",
+        "QShortcut",
+        "QSizeGrip",
+        "QSizePolicy",
+        "QSlider",
+        "QSpacerItem",
+        "QSpinBox",
+        "QSplashScreen",
+        "QSplitter",
+        "QSplitterHandle",
+        "QStackedLayout",
+        "QStackedWidget",
+        "QStatusBar",
+        "QStyle",
+        "QStyleFactory",
+        "QStyleHintReturn",
+        "QStyleHintReturnMask",
+        "QStyleHintReturnVariant",
+        "QStyleOption",
+        "QStyleOptionButton",
+        "QStyleOptionComboBox",
+        "QStyleOptionComplex",
+        "QStyleOptionDockWidget",
+        "QStyleOptionFocusRect",
+        "QStyleOptionFrame",
+        "QStyleOptionGraphicsItem",
+        "QStyleOptionGroupBox",
+        "QStyleOptionHeader",
+        "QStyleOptionMenuItem",
+        "QStyleOptionProgressBar",
+        "QStyleOptionRubberBand",
+        "QStyleOptionSizeGrip",
+        "QStyleOptionSlider",
+        "QStyleOptionSpinBox",
+        "QStyleOptionTab",
+        "QStyleOptionTabBarBase",
+        "QStyleOptionTabWidgetFrame",
+        "QStyleOptionTitleBar",
+        "QStyleOptionToolBar",
+        "QStyleOptionToolBox",
+        "QStyleOptionToolButton",
+        "QStyleOptionViewItem",
+        "QStylePainter",
+        "QStyledItemDelegate",
+        "QSwipeGesture",
+        "QSystemTrayIcon",
+        "QTabBar",
+        "QTabWidget",
+        "QTableView",
+        "QTableWidget",
+        "QTableWidgetItem",
+        "QTableWidgetSelectionRange",
+        "QTapAndHoldGesture",
+        "QTapGesture",
+        "QTextBrowser",
+        "QTextEdit",
+        "QTimeEdit",
+        "QToolBar",
+        "QToolBox",
+        "QToolButton",
+        "QToolTip",
+        "QTreeView",
+        "QTreeWidget",
+        "QTreeWidgetItem",
+        "QTreeWidgetItemIterator",
+        "QUndoCommand",
+        "QUndoGroup",
+        "QUndoStack",
+        "QUndoView",
+        "QVBoxLayout",
+        "QWhatsThis",
+        "QWidget",
+        "QWidgetAction",
+        "QWidgetItem",
+        "QWizard",
+        "QWizardPage"
+    ],
+    "QtX11Extras": [
+        "QX11Info"
+    ],
+    "QtXml": [
+        "QDomAttr",
+        "QDomCDATASection",
+        "QDomCharacterData",
+        "QDomComment",
+        "QDomDocument",
+        "QDomDocumentFragment",
+        "QDomDocumentType",
+        "QDomElement",
+        "QDomEntity",
+        "QDomEntityReference",
+        "QDomImplementation",
+        "QDomNamedNodeMap",
+        "QDomNode",
+        "QDomNodeList",
+        "QDomNotation",
+        "QDomProcessingInstruction",
+        "QDomText",
+        "QXmlAttributes",
+        "QXmlContentHandler",
+        "QXmlDTDHandler",
+        "QXmlDeclHandler",
+        "QXmlDefaultHandler",
+        "QXmlEntityResolver",
+        "QXmlErrorHandler",
+        "QXmlInputSource",
+        "QXmlLexicalHandler",
+        "QXmlLocator",
+        "QXmlNamespaceSupport",
+        "QXmlParseException",
+        "QXmlReader",
+        "QXmlSimpleReader"
+    ],
+    "QtXmlPatterns": [
+        "QAbstractMessageHandler",
+        "QAbstractUriResolver",
+        "QAbstractXmlNodeModel",
+        "QAbstractXmlReceiver",
+        "QSourceLocation",
+        "QXmlFormatter",
+        "QXmlItem",
+        "QXmlName",
+        "QXmlNamePool",
+        "QXmlNodeModelIndex",
+        "QXmlQuery",
+        "QXmlResultItems",
+        "QXmlSchema",
+        "QXmlSchemaValidator",
+        "QXmlSerializer"
+    ]
+}
+
+""" Missing members
+
+This mapping describes members that have been deprecated
+in one or more bindings and have been left out of the
+_common_members mapping.
+
+The member can provide an extra details string to be
+included in exceptions and warnings.
+"""
+
+_missing_members = {
+    "QtGui": {
+        "QMatrix": "Deprecated in PyQt5",
+    },
+}
+
+
+def _qInstallMessageHandler(handler):
+    """Install a message handler that works in all bindings
+
+    Args:
+        handler: A function that takes 3 arguments, or None
+    """
+    def messageOutputHandler(*args):
+        # In Qt4 bindings, message handlers are passed 2 arguments
+        # In Qt5 bindings, message handlers are passed 3 arguments
+        # The first argument is a QtMsgType
+        # The last argument is the message to be printed
+        # The Middle argument (if passed) is a QMessageLogContext
+        if len(args) == 3:
+            msgType, logContext, msg = args
+        elif len(args) == 2:
+            msgType, msg = args
+            logContext = None
+        else:
+            raise TypeError(
+                "handler expected 2 or 3 arguments, got {0}".format(len(args)))
+
+        if isinstance(msg, bytes):
+            # In python 3, some bindings pass a bytestring, which cannot be
+            # used elsewhere. Decoding a python 2 or 3 bytestring object will
+            # consistently return a unicode object.
+            msg = msg.decode()
+
+        handler(msgType, logContext, msg)
+
+    passObject = messageOutputHandler if handler else handler
+    if Qt.IsPySide or Qt.IsPyQt4:
+        return Qt._QtCore.qInstallMsgHandler(passObject)
+    elif Qt.IsPySide2 or Qt.IsPyQt5:
+        return Qt._QtCore.qInstallMessageHandler(passObject)
+
+
+def _getcpppointer(object):
+    if hasattr(Qt, "_shiboken2"):
+        return getattr(Qt, "_shiboken2").getCppPointer(object)[0]
+    elif hasattr(Qt, "_shiboken"):
+        return getattr(Qt, "_shiboken").getCppPointer(object)[0]
+    elif hasattr(Qt, "_sip"):
+        return getattr(Qt, "_sip").unwrapinstance(object)
+    raise AttributeError("'module' has no attribute 'getCppPointer'")
+
+
+def _wrapinstance(ptr, base=None):
+    """Enable implicit cast of pointer to most suitable class
+
+    This behaviour is available in sip per default.
+
+    Based on http://nathanhorne.com/pyqtpyside-wrap-instance
+
+    Usage:
+        This mechanism kicks in under these circumstances.
+        1. Qt.py is using PySide 1 or 2.
+        2. A `base` argument is not provided.
+
+        See :func:`QtCompat.wrapInstance()`
+
+    Arguments:
+        ptr (long): Pointer to QObject in memory
+        base (QObject, optional): Base class to wrap with. Defaults to QObject,
+            which should handle anything.
+
+    """
+
+    assert isinstance(ptr, long), "Argument 'ptr' must be of type <long>"
+    assert (base is None) or issubclass(base, Qt.QtCore.QObject), (
+        "Argument 'base' must be of type <QObject>")
+
+    if Qt.IsPyQt4 or Qt.IsPyQt5:
+        func = getattr(Qt, "_sip").wrapinstance
+    elif Qt.IsPySide2:
+        func = getattr(Qt, "_shiboken2").wrapInstance
+    elif Qt.IsPySide:
+        func = getattr(Qt, "_shiboken").wrapInstance
+    else:
+        raise AttributeError("'module' has no attribute 'wrapInstance'")
+
+    if base is None:
+        q_object = func(long(ptr), Qt.QtCore.QObject)
+        meta_object = q_object.metaObject()
+        class_name = meta_object.className()
+        super_class_name = meta_object.superClass().className()
+
+        if hasattr(Qt.QtWidgets, class_name):
+            base = getattr(Qt.QtWidgets, class_name)
+
+        elif hasattr(Qt.QtWidgets, super_class_name):
+            base = getattr(Qt.QtWidgets, super_class_name)
+
+        else:
+            base = Qt.QtCore.QObject
+
+    return func(long(ptr), base)
+
+
+def _isvalid(object):
+    """Check if the object is valid to use in Python runtime.
+
+    Usage:
+        See :func:`QtCompat.isValid()`
+
+    Arguments:
+        object (QObject): QObject to check the validity of.
+
+    """
+
+    assert isinstance(object, Qt.QtCore.QObject)
+
+    if hasattr(Qt, "_shiboken2"):
+        return getattr(Qt, "_shiboken2").isValid(object)
+
+    elif hasattr(Qt, "_shiboken"):
+        return getattr(Qt, "_shiboken").isValid(object)
+
+    elif hasattr(Qt, "_sip"):
+        return not getattr(Qt, "_sip").isdeleted(object)
+
+    else:
+        raise AttributeError("'module' has no attribute isValid")
+
+
+def _translate(context, sourceText, *args):
+    # In Qt4 bindings, translate can be passed 2 or 3 arguments
+    # In Qt5 bindings, translate can be passed 2 arguments
+    # The first argument is disambiguation[str]
+    # The last argument is n[int]
+    # The middle argument can be encoding[QtCore.QCoreApplication.Encoding]
+    if len(args) == 3:
+        disambiguation, encoding, n = args
+    elif len(args) == 2:
+        disambiguation, n = args
+        encoding = None
+    else:
+        raise TypeError(
+            "Expected 4 or 5 arguments, got {0}.".format(len(args) + 2))
+
+    if hasattr(Qt.QtCore, "QCoreApplication"):
+        app = getattr(Qt.QtCore, "QCoreApplication")
+    else:
+        raise NotImplementedError(
+            "Missing QCoreApplication implementation for {binding}".format(
+                binding=Qt.__binding__,
+            )
+        )
+    if Qt.__binding__ in ("PySide2", "PyQt5"):
+        sanitized_args = [context, sourceText, disambiguation, n]
+    else:
+        sanitized_args = [
+            context,
+            sourceText,
+            disambiguation,
+            encoding or app.CodecForTr,
+            n
+        ]
+    return app.translate(*sanitized_args)
+
+
+def _loadUi(uifile, baseinstance=None):
+    """Dynamically load a user interface from the given `uifile`
+
+    This function calls `uic.loadUi` if using PyQt bindings,
+    else it implements a comparable binding for PySide.
+
+    Documentation:
+        http://pyqt.sourceforge.net/Docs/PyQt5/designer.html#PyQt5.uic.loadUi
+
+    Arguments:
+        uifile (str): Absolute path to Qt Designer file.
+        baseinstance (QWidget): Instantiated QWidget or subclass thereof
+
+    Return:
+        baseinstance if `baseinstance` is not `None`. Otherwise
+        return the newly created instance of the user interface.
+
+    """
+    if hasattr(Qt, "_uic"):
+        return Qt._uic.loadUi(uifile, baseinstance)
+
+    elif hasattr(Qt, "_QtUiTools"):
+        # Implement `PyQt5.uic.loadUi` for PySide(2)
+
+        class _UiLoader(Qt._QtUiTools.QUiLoader):
+            """Create the user interface in a base instance.
+
+            Unlike `Qt._QtUiTools.QUiLoader` itself this class does not
+            create a new instance of the top-level widget, but creates the user
+            interface in an existing instance of the top-level class if needed.
+
+            This mimics the behaviour of `PyQt5.uic.loadUi`.
+
+            """
+
+            def __init__(self, baseinstance):
+                super(_UiLoader, self).__init__(baseinstance)
+                self.baseinstance = baseinstance
+                self.custom_widgets = {}
+
+            def _loadCustomWidgets(self, etree):
+                """
+                Workaround to pyside-77 bug.
+
+                From QUiLoader doc we should use registerCustomWidget method.
+                But this causes a segfault on some platforms.
+
+                Instead we fetch from customwidgets DOM node the python class
+                objects. Then we can directly use them in createWidget method.
+                """
+
+                def headerToModule(header):
+                    """
+                    Translate a header file to python module path
+                    foo/bar.h => foo.bar
+                    """
+                    # Remove header extension
+                    module = os.path.splitext(header)[0]
+
+                    # Replace os separator by python module separator
+                    return module.replace("/", ".").replace("\\", ".")
+
+                custom_widgets = etree.find("customwidgets")
+
+                if custom_widgets is None:
+                    return
+
+                for custom_widget in custom_widgets:
+                    class_name = custom_widget.find("class").text
+                    header = custom_widget.find("header").text
+                    module = importlib.import_module(headerToModule(header))
+                    self.custom_widgets[class_name] = getattr(module,
+                                                              class_name)
+
+            def load(self, uifile, *args, **kwargs):
+                from xml.etree.ElementTree import ElementTree
+
+                # For whatever reason, if this doesn't happen then
+                # reading an invalid or non-existing .ui file throws
+                # a RuntimeError.
+                etree = ElementTree()
+                etree.parse(uifile)
+                self._loadCustomWidgets(etree)
+
+                widget = Qt._QtUiTools.QUiLoader.load(
+                    self, uifile, *args, **kwargs)
+
+                # Workaround for PySide 1.0.9, see issue #208
+                widget.parentWidget()
+
+                return widget
+
+            def createWidget(self, class_name, parent=None, name=""):
+                """Called for each widget defined in ui file
+
+                Overridden here to populate `baseinstance` instead.
+
+                """
+
+                if parent is None and self.baseinstance:
+                    # Supposed to create the top-level widget,
+                    # return the base instance instead
+                    return self.baseinstance
+
+                # For some reason, Line is not in the list of available
+                # widgets, but works fine, so we have to special case it here.
+                if class_name in self.availableWidgets() + ["Line"]:
+                    # Create a new widget for child widgets
+                    widget = Qt._QtUiTools.QUiLoader.createWidget(self,
+                                                                  class_name,
+                                                                  parent,
+                                                                  name)
+                elif class_name in self.custom_widgets:
+                    widget = self.custom_widgets[class_name](parent)
+                else:
+                    raise Exception("Custom widget '%s' not supported"
+                                    % class_name)
+
+                if self.baseinstance:
+                    # Set an attribute for the new child widget on the base
+                    # instance, just like PyQt5.uic.loadUi does.
+                    setattr(self.baseinstance, name, widget)
+
+                return widget
+
+        widget = _UiLoader(baseinstance).load(uifile)
+        Qt.QtCore.QMetaObject.connectSlotsByName(widget)
+
+        return widget
+
+    else:
+        raise NotImplementedError("No implementation available for loadUi")
+
+
+"""Misplaced members
+
+These members from the original submodule are misplaced relative PySide2
+
+"""
+_misplaced_members = {
+    "PySide2": {
+        "QtCore.QStringListModel": "QtCore.QStringListModel",
+        "QtGui.QStringListModel": "QtCore.QStringListModel",
+        "QtCore.Property": "QtCore.Property",
+        "QtCore.Signal": "QtCore.Signal",
+        "QtCore.Slot": "QtCore.Slot",
+        "QtCore.QAbstractProxyModel": "QtCore.QAbstractProxyModel",
+        "QtCore.QSortFilterProxyModel": "QtCore.QSortFilterProxyModel",
+        "QtCore.QItemSelection": "QtCore.QItemSelection",
+        "QtCore.QItemSelectionModel": "QtCore.QItemSelectionModel",
+        "QtCore.QItemSelectionRange": "QtCore.QItemSelectionRange",
+        "QtUiTools.QUiLoader": ["QtCompat.loadUi", _loadUi],
+        "shiboken2.wrapInstance": ["QtCompat.wrapInstance", _wrapinstance],
+        "shiboken2.getCppPointer": ["QtCompat.getCppPointer", _getcpppointer],
+        "shiboken2.isValid": ["QtCompat.isValid", _isvalid],
+        "QtWidgets.qApp": "QtWidgets.QApplication.instance()",
+        "QtCore.QCoreApplication.translate": [
+            "QtCompat.translate", _translate
+        ],
+        "QtWidgets.QApplication.translate": [
+            "QtCompat.translate", _translate
+        ],
+        "QtCore.qInstallMessageHandler": [
+            "QtCompat.qInstallMessageHandler", _qInstallMessageHandler
+        ],
+        "QtWidgets.QStyleOptionViewItem": "QtCompat.QStyleOptionViewItemV4",
+    },
+    "PyQt5": {
+        "QtCore.pyqtProperty": "QtCore.Property",
+        "QtCore.pyqtSignal": "QtCore.Signal",
+        "QtCore.pyqtSlot": "QtCore.Slot",
+        "QtCore.QAbstractProxyModel": "QtCore.QAbstractProxyModel",
+        "QtCore.QSortFilterProxyModel": "QtCore.QSortFilterProxyModel",
+        "QtCore.QStringListModel": "QtCore.QStringListModel",
+        "QtCore.QItemSelection": "QtCore.QItemSelection",
+        "QtCore.QItemSelectionModel": "QtCore.QItemSelectionModel",
+        "QtCore.QItemSelectionRange": "QtCore.QItemSelectionRange",
+        "uic.loadUi": ["QtCompat.loadUi", _loadUi],
+        "sip.wrapinstance": ["QtCompat.wrapInstance", _wrapinstance],
+        "sip.unwrapinstance": ["QtCompat.getCppPointer", _getcpppointer],
+        "sip.isdeleted": ["QtCompat.isValid", _isvalid],
+        "QtWidgets.qApp": "QtWidgets.QApplication.instance()",
+        "QtCore.QCoreApplication.translate": [
+            "QtCompat.translate", _translate
+        ],
+        "QtWidgets.QApplication.translate": [
+            "QtCompat.translate", _translate
+        ],
+        "QtCore.qInstallMessageHandler": [
+            "QtCompat.qInstallMessageHandler", _qInstallMessageHandler
+        ],
+        "QtWidgets.QStyleOptionViewItem": "QtCompat.QStyleOptionViewItemV4",
+    },
+    "PySide": {
+        "QtGui.QAbstractProxyModel": "QtCore.QAbstractProxyModel",
+        "QtGui.QSortFilterProxyModel": "QtCore.QSortFilterProxyModel",
+        "QtGui.QStringListModel": "QtCore.QStringListModel",
+        "QtGui.QItemSelection": "QtCore.QItemSelection",
+        "QtGui.QItemSelectionModel": "QtCore.QItemSelectionModel",
+        "QtCore.Property": "QtCore.Property",
+        "QtCore.Signal": "QtCore.Signal",
+        "QtCore.Slot": "QtCore.Slot",
+        "QtGui.QItemSelectionRange": "QtCore.QItemSelectionRange",
+        "QtGui.QAbstractPrintDialog": "QtPrintSupport.QAbstractPrintDialog",
+        "QtGui.QPageSetupDialog": "QtPrintSupport.QPageSetupDialog",
+        "QtGui.QPrintDialog": "QtPrintSupport.QPrintDialog",
+        "QtGui.QPrintEngine": "QtPrintSupport.QPrintEngine",
+        "QtGui.QPrintPreviewDialog": "QtPrintSupport.QPrintPreviewDialog",
+        "QtGui.QPrintPreviewWidget": "QtPrintSupport.QPrintPreviewWidget",
+        "QtGui.QPrinter": "QtPrintSupport.QPrinter",
+        "QtGui.QPrinterInfo": "QtPrintSupport.QPrinterInfo",
+        "QtUiTools.QUiLoader": ["QtCompat.loadUi", _loadUi],
+        "shiboken.wrapInstance": ["QtCompat.wrapInstance", _wrapinstance],
+        "shiboken.unwrapInstance": ["QtCompat.getCppPointer", _getcpppointer],
+        "shiboken.isValid": ["QtCompat.isValid", _isvalid],
+        "QtGui.qApp": "QtWidgets.QApplication.instance()",
+        "QtCore.QCoreApplication.translate": [
+            "QtCompat.translate", _translate
+        ],
+        "QtGui.QApplication.translate": [
+            "QtCompat.translate", _translate
+        ],
+        "QtCore.qInstallMsgHandler": [
+            "QtCompat.qInstallMessageHandler", _qInstallMessageHandler
+        ],
+        "QtGui.QStyleOptionViewItemV4": "QtCompat.QStyleOptionViewItemV4",
+    },
+    "PyQt4": {
+        "QtGui.QAbstractProxyModel": "QtCore.QAbstractProxyModel",
+        "QtGui.QSortFilterProxyModel": "QtCore.QSortFilterProxyModel",
+        "QtGui.QItemSelection": "QtCore.QItemSelection",
+        "QtGui.QStringListModel": "QtCore.QStringListModel",
+        "QtGui.QItemSelectionModel": "QtCore.QItemSelectionModel",
+        "QtCore.pyqtProperty": "QtCore.Property",
+        "QtCore.pyqtSignal": "QtCore.Signal",
+        "QtCore.pyqtSlot": "QtCore.Slot",
+        "QtGui.QItemSelectionRange": "QtCore.QItemSelectionRange",
+        "QtGui.QAbstractPrintDialog": "QtPrintSupport.QAbstractPrintDialog",
+        "QtGui.QPageSetupDialog": "QtPrintSupport.QPageSetupDialog",
+        "QtGui.QPrintDialog": "QtPrintSupport.QPrintDialog",
+        "QtGui.QPrintEngine": "QtPrintSupport.QPrintEngine",
+        "QtGui.QPrintPreviewDialog": "QtPrintSupport.QPrintPreviewDialog",
+        "QtGui.QPrintPreviewWidget": "QtPrintSupport.QPrintPreviewWidget",
+        "QtGui.QPrinter": "QtPrintSupport.QPrinter",
+        "QtGui.QPrinterInfo": "QtPrintSupport.QPrinterInfo",
+        # "QtCore.pyqtSignature": "QtCore.Slot",
+        "uic.loadUi": ["QtCompat.loadUi", _loadUi],
+        "sip.wrapinstance": ["QtCompat.wrapInstance", _wrapinstance],
+        "sip.unwrapinstance": ["QtCompat.getCppPointer", _getcpppointer],
+        "sip.isdeleted": ["QtCompat.isValid", _isvalid],
+        "QtCore.QString": "str",
+        "QtGui.qApp": "QtWidgets.QApplication.instance()",
+        "QtCore.QCoreApplication.translate": [
+            "QtCompat.translate", _translate
+        ],
+        "QtGui.QApplication.translate": [
+            "QtCompat.translate", _translate
+        ],
+        "QtCore.qInstallMsgHandler": [
+            "QtCompat.qInstallMessageHandler", _qInstallMessageHandler
+        ],
+        "QtGui.QStyleOptionViewItemV4": "QtCompat.QStyleOptionViewItemV4",
+    }
+}
+
+""" Compatibility Members
+
+This dictionary is used to build Qt.QtCompat objects that provide a consistent
+interface for obsolete members, and differences in binding return values.
+
+{
+    "binding": {
+        "classname": {
+            "targetname": "binding_namespace",
+        }
+    }
+}
+"""
+_compatibility_members = {
+    "PySide2": {
+        "QWidget": {
+            "grab": "QtWidgets.QWidget.grab",
+        },
+        "QHeaderView": {
+            "sectionsClickable": "QtWidgets.QHeaderView.sectionsClickable",
+            "setSectionsClickable":
+                "QtWidgets.QHeaderView.setSectionsClickable",
+            "sectionResizeMode": "QtWidgets.QHeaderView.sectionResizeMode",
+            "setSectionResizeMode":
+                "QtWidgets.QHeaderView.setSectionResizeMode",
+            "sectionsMovable": "QtWidgets.QHeaderView.sectionsMovable",
+            "setSectionsMovable": "QtWidgets.QHeaderView.setSectionsMovable",
+        },
+        "QFileDialog": {
+            "getOpenFileName": "QtWidgets.QFileDialog.getOpenFileName",
+            "getOpenFileNames": "QtWidgets.QFileDialog.getOpenFileNames",
+            "getSaveFileName": "QtWidgets.QFileDialog.getSaveFileName",
+        },
+    },
+    "PyQt5": {
+        "QWidget": {
+            "grab": "QtWidgets.QWidget.grab",
+        },
+        "QHeaderView": {
+            "sectionsClickable": "QtWidgets.QHeaderView.sectionsClickable",
+            "setSectionsClickable":
+                "QtWidgets.QHeaderView.setSectionsClickable",
+            "sectionResizeMode": "QtWidgets.QHeaderView.sectionResizeMode",
+            "setSectionResizeMode":
+                "QtWidgets.QHeaderView.setSectionResizeMode",
+            "sectionsMovable": "QtWidgets.QHeaderView.sectionsMovable",
+            "setSectionsMovable": "QtWidgets.QHeaderView.setSectionsMovable",
+        },
+        "QFileDialog": {
+            "getOpenFileName": "QtWidgets.QFileDialog.getOpenFileName",
+            "getOpenFileNames": "QtWidgets.QFileDialog.getOpenFileNames",
+            "getSaveFileName": "QtWidgets.QFileDialog.getSaveFileName",
+        },
+    },
+    "PySide": {
+        "QWidget": {
+            "grab": "QtWidgets.QPixmap.grabWidget",
+        },
+        "QHeaderView": {
+            "sectionsClickable": "QtWidgets.QHeaderView.isClickable",
+            "setSectionsClickable": "QtWidgets.QHeaderView.setClickable",
+            "sectionResizeMode": "QtWidgets.QHeaderView.resizeMode",
+            "setSectionResizeMode": "QtWidgets.QHeaderView.setResizeMode",
+            "sectionsMovable": "QtWidgets.QHeaderView.isMovable",
+            "setSectionsMovable": "QtWidgets.QHeaderView.setMovable",
+        },
+        "QFileDialog": {
+            "getOpenFileName": "QtWidgets.QFileDialog.getOpenFileName",
+            "getOpenFileNames": "QtWidgets.QFileDialog.getOpenFileNames",
+            "getSaveFileName": "QtWidgets.QFileDialog.getSaveFileName",
+        },
+    },
+    "PyQt4": {
+        "QWidget": {
+            "grab": "QtWidgets.QPixmap.grabWidget",
+        },
+        "QHeaderView": {
+            "sectionsClickable": "QtWidgets.QHeaderView.isClickable",
+            "setSectionsClickable": "QtWidgets.QHeaderView.setClickable",
+            "sectionResizeMode": "QtWidgets.QHeaderView.resizeMode",
+            "setSectionResizeMode": "QtWidgets.QHeaderView.setResizeMode",
+            "sectionsMovable": "QtWidgets.QHeaderView.isMovable",
+            "setSectionsMovable": "QtWidgets.QHeaderView.setMovable",
+        },
+        "QFileDialog": {
+            "getOpenFileName": "QtWidgets.QFileDialog.getOpenFileName",
+            "getOpenFileNames": "QtWidgets.QFileDialog.getOpenFileNames",
+            "getSaveFileName": "QtWidgets.QFileDialog.getSaveFileName",
+        },
+    },
+}
+
+
+def _apply_site_config():
+    try:
+        import QtSiteConfig
+    except ImportError:
+        # If no QtSiteConfig module found, no modifications
+        # to _common_members are needed.
+        pass
+    else:
+        # Provide the ability to modify the dicts used to build Qt.py
+        if hasattr(QtSiteConfig, 'update_members'):
+            QtSiteConfig.update_members(_common_members)
+
+        if hasattr(QtSiteConfig, 'update_misplaced_members'):
+            QtSiteConfig.update_misplaced_members(members=_misplaced_members)
+
+        if hasattr(QtSiteConfig, 'update_compatibility_members'):
+            QtSiteConfig.update_compatibility_members(
+                members=_compatibility_members)
+
+
+def _new_module(name):
+    return types.ModuleType(__name__ + "." + name)
+
+
+def _import_sub_module(module, name):
+    """import_sub_module will mimic the function of importlib.import_module"""
+    module = __import__(module.__name__ + "." + name)
+    for level in name.split("."):
+        module = getattr(module, level)
+    return module
+
+
+def _setup(module, extras):
+    """Install common submodules"""
+
+    Qt.__binding__ = module.__name__
+
+    for name in list(_common_members) + extras:
+        try:
+            submodule = _import_sub_module(
+                module, name)
+        except ImportError:
+            try:
+                # For extra modules like sip and shiboken that may not be
+                # children of the binding.
+                submodule = __import__(name)
+            except ImportError:
+                continue
+
+        setattr(Qt, "_" + name, submodule)
+
+        if name not in extras:
+            # Store reference to original binding,
+            # but don't store speciality modules
+            # such as uic or QtUiTools
+            setattr(Qt, name, _new_module(name))
+
+
+def _reassign_misplaced_members(binding):
+    """Apply misplaced members from `binding` to Qt.py
+
+    Arguments:
+        binding (dict): Misplaced members
+
+    """
+
+    for src, dst in _misplaced_members[binding].items():
+        dst_value = None
+
+        src_parts = src.split(".")
+        src_module = src_parts[0]
+        src_member = None
+        if len(src_parts) > 1:
+            src_member = src_parts[1:]
+
+        if isinstance(dst, (list, tuple)):
+            dst, dst_value = dst
+
+        dst_parts = dst.split(".")
+        dst_module = dst_parts[0]
+        dst_member = None
+        if len(dst_parts) > 1:
+            dst_member = dst_parts[1]
+
+        # Get the member we want to store in the namesapce.
+        if not dst_value:
+            try:
+                _part = getattr(Qt, "_" + src_module)
+                while src_member:
+                    member = src_member.pop(0)
+                    _part = getattr(_part, member)
+                dst_value = _part
+            except AttributeError:
+                # If the member we want to store in the namespace does not
+                # exist, there is no need to continue. This can happen if a
+                # request was made to rename a member that didn't exist, for
+                # example if QtWidgets isn't available on the target platform.
+                _log("Misplaced member has no source: {0}".format(src))
+                continue
+
+        try:
+            src_object = getattr(Qt, dst_module)
+        except AttributeError:
+            if dst_module not in _common_members:
+                # Only create the Qt parent module if its listed in
+                # _common_members. Without this check, if you remove QtCore
+                # from _common_members, the default _misplaced_members will add
+                # Qt.QtCore so it can add Signal, Slot, etc.
+                msg = 'Not creating missing member module "{m}" for "{c}"'
+                _log(msg.format(m=dst_module, c=dst_member))
+                continue
+            # If the dst is valid but the Qt parent module does not exist
+            # then go ahead and create a new module to contain the member.
+            setattr(Qt, dst_module, _new_module(dst_module))
+            src_object = getattr(Qt, dst_module)
+            # Enable direct import of the new module
+            sys.modules[__name__ + "." + dst_module] = src_object
+
+        if not dst_value:
+            dst_value = getattr(Qt, "_" + src_module)
+            if src_member:
+                dst_value = getattr(dst_value, src_member)
+
+        setattr(
+            src_object,
+            dst_member or dst_module,
+            dst_value
+        )
+
+
+def _build_compatibility_members(binding, decorators=None):
+    """Apply `binding` to QtCompat
+
+    Arguments:
+        binding (str): Top level binding in _compatibility_members.
+        decorators (dict, optional): Provides the ability to decorate the
+            original Qt methods when needed by a binding. This can be used
+            to change the returned value to a standard value. The key should
+            be the classname, the value is a dict where the keys are the
+            target method names, and the values are the decorator functions.
+
+    """
+
+    decorators = decorators or dict()
+
+    # Allow optional site-level customization of the compatibility members.
+    # This method does not need to be implemented in QtSiteConfig.
+    try:
+        import QtSiteConfig
+    except ImportError:
+        pass
+    else:
+        if hasattr(QtSiteConfig, 'update_compatibility_decorators'):
+            QtSiteConfig.update_compatibility_decorators(binding, decorators)
+
+    _QtCompat = type("QtCompat", (object,), {})
+
+    for classname, bindings in _compatibility_members[binding].items():
+        attrs = {}
+        for target, binding in bindings.items():
+            namespaces = binding.split('.')
+            try:
+                src_object = getattr(Qt, "_" + namespaces[0])
+            except AttributeError as e:
+                _log("QtCompat: AttributeError: %s" % e)
+                # Skip reassignment of non-existing members.
+                # This can happen if a request was made to
+                # rename a member that didn't exist, for example
+                # if QtWidgets isn't available on the target platform.
+                continue
+
+            # Walk down any remaining namespace getting the object assuming
+            # that if the first namespace exists the rest will exist.
+            for namespace in namespaces[1:]:
+                src_object = getattr(src_object, namespace)
+
+            # decorate the Qt method if a decorator was provided.
+            if target in decorators.get(classname, []):
+                # staticmethod must be called on the decorated method to
+                # prevent a TypeError being raised when the decorated method
+                # is called.
+                src_object = staticmethod(
+                    decorators[classname][target](src_object))
+
+            attrs[target] = src_object
+
+        # Create the QtCompat class and install it into the namespace
+        compat_class = type(classname, (_QtCompat,), attrs)
+        setattr(Qt.QtCompat, classname, compat_class)
+
+
+def _pyside2():
+    """Initialise PySide2
+
+    These functions serve to test the existence of a binding
+    along with set it up in such a way that it aligns with
+    the final step; adding members from the original binding
+    to Qt.py
+
+    """
+
+    import PySide2 as module
+    extras = ["QtUiTools"]
+    try:
+        try:
+            # Before merge of PySide and shiboken
+            import shiboken2
+        except ImportError:
+            # After merge of PySide and shiboken, May 2017
+            from PySide2 import shiboken2
+        extras.append("shiboken2")
+    except ImportError:
+        pass
+
+    _setup(module, extras)
+    Qt.__binding_version__ = module.__version__
+
+    if hasattr(Qt, "_shiboken2"):
+        Qt.QtCompat.wrapInstance = _wrapinstance
+        Qt.QtCompat.getCppPointer = _getcpppointer
+        Qt.QtCompat.delete = shiboken2.delete
+
+    if hasattr(Qt, "_QtUiTools"):
+        Qt.QtCompat.loadUi = _loadUi
+
+    if hasattr(Qt, "_QtCore"):
+        Qt.__qt_version__ = Qt._QtCore.qVersion()
+        Qt.QtCompat.dataChanged = (
+            lambda self, topleft, bottomright, roles=None:
+            self.dataChanged.emit(topleft, bottomright, roles or [])
+        )
+
+    if hasattr(Qt, "_QtWidgets"):
+        Qt.QtCompat.setSectionResizeMode = \
+            Qt._QtWidgets.QHeaderView.setSectionResizeMode
+
+    _reassign_misplaced_members("PySide2")
+    _build_compatibility_members("PySide2")
+
+
+def _pyside():
+    """Initialise PySide"""
+
+    import PySide as module
+    extras = ["QtUiTools"]
+    try:
+        try:
+            # Before merge of PySide and shiboken
+            import shiboken
+        except ImportError:
+            # After merge of PySide and shiboken, May 2017
+            from PySide import shiboken
+        extras.append("shiboken")
+    except ImportError:
+        pass
+
+    _setup(module, extras)
+    Qt.__binding_version__ = module.__version__
+
+    if hasattr(Qt, "_shiboken"):
+        Qt.QtCompat.wrapInstance = _wrapinstance
+        Qt.QtCompat.getCppPointer = _getcpppointer
+        Qt.QtCompat.delete = shiboken.delete
+
+    if hasattr(Qt, "_QtUiTools"):
+        Qt.QtCompat.loadUi = _loadUi
+
+    if hasattr(Qt, "_QtGui"):
+        setattr(Qt, "QtWidgets", _new_module("QtWidgets"))
+        setattr(Qt, "_QtWidgets", Qt._QtGui)
+        if hasattr(Qt._QtGui, "QX11Info"):
+            setattr(Qt, "QtX11Extras", _new_module("QtX11Extras"))
+            Qt.QtX11Extras.QX11Info = Qt._QtGui.QX11Info
+
+        Qt.QtCompat.setSectionResizeMode = Qt._QtGui.QHeaderView.setResizeMode
+
+    if hasattr(Qt, "_QtCore"):
+        Qt.__qt_version__ = Qt._QtCore.qVersion()
+        Qt.QtCompat.dataChanged = (
+            lambda self, topleft, bottomright, roles=None:
+            self.dataChanged.emit(topleft, bottomright)
+        )
+
+    _reassign_misplaced_members("PySide")
+    _build_compatibility_members("PySide")
+
+
+def _pyqt5():
+    """Initialise PyQt5"""
+
+    import PyQt5 as module
+    extras = ["uic"]
+
+    try:
+        import sip
+        extras += ["sip"]
+    except ImportError:
+
+        # Relevant to PyQt5 5.11 and above
+        try:
+            from PyQt5 import sip
+            extras += ["sip"]
+        except ImportError:
+            sip = None
+
+    _setup(module, extras)
+    if hasattr(Qt, "_sip"):
+        Qt.QtCompat.wrapInstance = _wrapinstance
+        Qt.QtCompat.getCppPointer = _getcpppointer
+        Qt.QtCompat.delete = sip.delete
+
+    if hasattr(Qt, "_uic"):
+        Qt.QtCompat.loadUi = _loadUi
+
+    if hasattr(Qt, "_QtCore"):
+        Qt.__binding_version__ = Qt._QtCore.PYQT_VERSION_STR
+        Qt.__qt_version__ = Qt._QtCore.QT_VERSION_STR
+        Qt.QtCompat.dataChanged = (
+            lambda self, topleft, bottomright, roles=None:
+            self.dataChanged.emit(topleft, bottomright, roles or [])
+        )
+
+    if hasattr(Qt, "_QtWidgets"):
+        Qt.QtCompat.setSectionResizeMode = \
+            Qt._QtWidgets.QHeaderView.setSectionResizeMode
+
+    _reassign_misplaced_members("PyQt5")
+    _build_compatibility_members('PyQt5')
+
+
+def _pyqt4():
+    """Initialise PyQt4"""
+
+    import sip
+
+    # Validation of envivornment variable. Prevents an error if
+    # the variable is invalid since it's just a hint.
+    try:
+        hint = int(QT_SIP_API_HINT)
+    except TypeError:
+        hint = None  # Variable was None, i.e. not set.
+    except ValueError:
+        raise ImportError("QT_SIP_API_HINT=%s must be a 1 or 2")
+
+    for api in ("QString",
+                "QVariant",
+                "QDate",
+                "QDateTime",
+                "QTextStream",
+                "QTime",
+                "QUrl"):
+        try:
+            sip.setapi(api, hint or 2)
+        except AttributeError:
+            raise ImportError("PyQt4 < 4.6 isn't supported by Qt.py")
+        except ValueError:
+            actual = sip.getapi(api)
+            if not hint:
+                raise ImportError("API version already set to %d" % actual)
+            else:
+                # Having provided a hint indicates a soft constraint, one
+                # that doesn't throw an exception.
+                sys.stderr.write(
+                    "Warning: API '%s' has already been set to %d.\n"
+                    % (api, actual)
+                )
+
+    import PyQt4 as module
+    extras = ["uic"]
+    try:
+        import sip
+        extras.append(sip.__name__)
+    except ImportError:
+        sip = None
+
+    _setup(module, extras)
+    if hasattr(Qt, "_sip"):
+        Qt.QtCompat.wrapInstance = _wrapinstance
+        Qt.QtCompat.getCppPointer = _getcpppointer
+        Qt.QtCompat.delete = sip.delete
+
+    if hasattr(Qt, "_uic"):
+        Qt.QtCompat.loadUi = _loadUi
+
+    if hasattr(Qt, "_QtGui"):
+        setattr(Qt, "QtWidgets", _new_module("QtWidgets"))
+        setattr(Qt, "_QtWidgets", Qt._QtGui)
+        if hasattr(Qt._QtGui, "QX11Info"):
+            setattr(Qt, "QtX11Extras", _new_module("QtX11Extras"))
+            Qt.QtX11Extras.QX11Info = Qt._QtGui.QX11Info
+
+        Qt.QtCompat.setSectionResizeMode = \
+            Qt._QtGui.QHeaderView.setResizeMode
+
+    if hasattr(Qt, "_QtCore"):
+        Qt.__binding_version__ = Qt._QtCore.PYQT_VERSION_STR
+        Qt.__qt_version__ = Qt._QtCore.QT_VERSION_STR
+        Qt.QtCompat.dataChanged = (
+            lambda self, topleft, bottomright, roles=None:
+            self.dataChanged.emit(topleft, bottomright)
+        )
+
+    _reassign_misplaced_members("PyQt4")
+
+    # QFileDialog QtCompat decorator
+    def _standardizeQFileDialog(some_function):
+        """Decorator that makes PyQt4 return conform to other bindings"""
+        def wrapper(*args, **kwargs):
+            ret = (some_function(*args, **kwargs))
+
+            # PyQt4 only returns the selected filename, force it to a
+            # standard return of the selected filename, and a empty string
+            # for the selected filter
+            return ret, ''
+
+        wrapper.__doc__ = some_function.__doc__
+        wrapper.__name__ = some_function.__name__
+
+        return wrapper
+
+    decorators = {
+        "QFileDialog": {
+            "getOpenFileName": _standardizeQFileDialog,
+            "getOpenFileNames": _standardizeQFileDialog,
+            "getSaveFileName": _standardizeQFileDialog,
+        }
+    }
+    _build_compatibility_members('PyQt4', decorators)
+
+
+def _none():
+    """Internal option (used in installer)"""
+
+    Mock = type("Mock", (), {"__getattr__": lambda Qt, attr: None})
+
+    Qt.__binding__ = "None"
+    Qt.__qt_version__ = "0.0.0"
+    Qt.__binding_version__ = "0.0.0"
+    Qt.QtCompat.loadUi = lambda uifile, baseinstance=None: None
+    Qt.QtCompat.setSectionResizeMode = lambda *args, **kwargs: None
+
+    for submodule in _common_members.keys():
+        setattr(Qt, submodule, Mock())
+        setattr(Qt, "_" + submodule, Mock())
+
+
+def _log(text):
+    if QT_VERBOSE:
+        sys.stdout.write(text + "\n")
+
+
+def _convert(lines):
+    """Convert compiled .ui file from PySide2 to Qt.py
+
+    Arguments:
+        lines (list): Each line of of .ui file
+
+    Usage:
+        >> with open("myui.py") as f:
+        ..   lines = _convert(f.readlines())
+
+    """
+
+    def parse(line):
+        line = line.replace("from PySide2 import", "from Qt import QtCompat,")
+        line = line.replace("QtWidgets.QApplication.translate",
+                            "QtCompat.translate")
+        if "QtCore.SIGNAL" in line:
+            raise NotImplementedError("QtCore.SIGNAL is missing from PyQt5 "
+                                      "and so Qt.py does not support it: you "
+                                      "should avoid defining signals inside "
+                                      "your ui files.")
+        return line
+
+    parsed = list()
+    for line in lines:
+        line = parse(line)
+        parsed.append(line)
+
+    return parsed
+
+
+def _cli(args):
+    """Qt.py command-line interface"""
+    import argparse
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--convert",
+                        help="Path to compiled Python module, e.g. my_ui.py")
+    parser.add_argument("--compile",
+                        help="Accept raw .ui file and compile with native "
+                             "PySide2 compiler.")
+    parser.add_argument("--stdout",
+                        help="Write to stdout instead of file",
+                        action="store_true")
+    parser.add_argument("--stdin",
+                        help="Read from stdin instead of file",
+                        action="store_true")
+
+    args = parser.parse_args(args)
+
+    if args.stdout:
+        raise NotImplementedError("--stdout")
+
+    if args.stdin:
+        raise NotImplementedError("--stdin")
+
+    if args.compile:
+        raise NotImplementedError("--compile")
+
+    if args.convert:
+        sys.stdout.write("#\n"
+                         "# WARNING: --convert is an ALPHA feature.\n#\n"
+                         "# See https://github.com/mottosso/Qt.py/pull/132\n"
+                         "# for details.\n"
+                         "#\n")
+
+        #
+        # ------> Read
+        #
+        with open(args.convert) as f:
+            lines = _convert(f.readlines())
+
+        backup = "%s_backup%s" % os.path.splitext(args.convert)
+        sys.stdout.write("Creating \"%s\"..\n" % backup)
+        shutil.copy(args.convert, backup)
+
+        #
+        # <------ Write
+        #
+        with open(args.convert, "w") as f:
+            f.write("".join(lines))
+
+        sys.stdout.write("Successfully converted \"%s\"\n" % args.convert)
+
+
+class MissingMember(object):
+    """
+    A placeholder type for a missing Qt object not
+    included in Qt.py
+
+    Args:
+        name (str): The name of the missing type
+        details (str): An optional custom error message
+    """
+    ERR_TMPL = ("{} is not a common object across PySide2 "
+                "and the other Qt bindings. It is not included "
+                "as a common member in the Qt.py layer")
+
+    def __init__(self, name, details=''):
+        self.__name = name
+        self.__err = self.ERR_TMPL.format(name)
+
+        if details:
+            self.__err = "{}: {}".format(self.__err, details)
+
+    def __repr__(self):
+        return "<{}: {}>".format(self.__class__.__name__, self.__name)
+
+    def __getattr__(self, name):
+        raise NotImplementedError(self.__err)
+
+    def __call__(self, *a, **kw):
+        raise NotImplementedError(self.__err)
+
+
+def _install():
+    # Default order (customise order and content via QT_PREFERRED_BINDING)
+    default_order = ("PySide2", "PyQt5", "PySide", "PyQt4")
+    preferred_order = list(
+        b for b in QT_PREFERRED_BINDING.split(os.pathsep) if b
+    )
+
+    order = preferred_order or default_order
+
+    available = {
+        "PySide2": _pyside2,
+        "PyQt5": _pyqt5,
+        "PySide": _pyside,
+        "PyQt4": _pyqt4,
+        "None": _none
+    }
+
+    _log("Order: '%s'" % "', '".join(order))
+
+    # Allow site-level customization of the available modules.
+    _apply_site_config()
+
+    found_binding = False
+    for name in order:
+        _log("Trying %s" % name)
+
+        try:
+            available[name]()
+            found_binding = True
+            break
+
+        except ImportError as e:
+            _log("ImportError: %s" % e)
+
+        except KeyError:
+            _log("ImportError: Preferred binding '%s' not found." % name)
+
+    if not found_binding:
+        # If not binding were found, throw this error
+        raise ImportError("No Qt binding were found.")
+
+    # Install individual members
+    for name, members in _common_members.items():
+        try:
+            their_submodule = getattr(Qt, "_%s" % name)
+        except AttributeError:
+            continue
+
+        our_submodule = getattr(Qt, name)
+
+        # Enable import *
+        __all__.append(name)
+
+        # Enable direct import of submodule,
+        # e.g. import Qt.QtCore
+        sys.modules[__name__ + "." + name] = our_submodule
+
+        for member in members:
+            # Accept that a submodule may miss certain members.
+            try:
+                their_member = getattr(their_submodule, member)
+            except AttributeError:
+                _log("'%s.%s' was missing." % (name, member))
+                continue
+
+            setattr(our_submodule, member, their_member)
+
+    # Install missing member placeholders
+    for name, members in _missing_members.items():
+        our_submodule = getattr(Qt, name)
+
+        for member in members:
+
+            # If the submodule already has this member installed,
+            # either by the common members, or the site config,
+            # then skip installing this one over it.
+            if hasattr(our_submodule, member):
+                continue
+
+            placeholder = MissingMember("{}.{}".format(name, member),
+                                        details=members[member])
+            setattr(our_submodule, member, placeholder)
+
+    # Enable direct import of QtCompat
+    sys.modules['Qt.QtCompat'] = Qt.QtCompat
+
+    # Backwards compatibility
+    if hasattr(Qt.QtCompat, 'loadUi'):
+        Qt.QtCompat.load_ui = Qt.QtCompat.loadUi
+
+
+_install()
+
+# Setup Binding Enum states
+Qt.IsPySide2 = Qt.__binding__ == 'PySide2'
+Qt.IsPyQt5 = Qt.__binding__ == 'PyQt5'
+Qt.IsPySide = Qt.__binding__ == 'PySide'
+Qt.IsPyQt4 = Qt.__binding__ == 'PyQt4'
+
+"""Augment QtCompat
+
+QtCompat contains wrappers and added functionality
+to the original bindings, such as the CLI interface
+and otherwise incompatible members between bindings,
+such as `QHeaderView.setSectionResizeMode`.
+
+"""
+
+Qt.QtCompat._cli = _cli
+Qt.QtCompat._convert = _convert
+
+# Enable command-line interface
+if __name__ == "__main__":
+    _cli(sys.argv[1:])
+
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2016-2017 Marcus Ottosson
+#
+# 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.
+#
+# In PySide(2), loadUi does not exist, so we implement it
+#
+# `_UiLoader` is adapted from the qtpy project, which was further influenced
+# by qt-helpers which was released under a 3-clause BSD license which in turn
+# is based on a solution at:
+#
+# - https://gist.github.com/cpbotha/1b42a20c8f3eb9bb7cb8
+#
+# The License for this code is as follows:
+#
+# qt-helpers - a common front-end to various Qt modules
+#
+# Copyright (c) 2015, Chris Beaumont and Thomas Robitaille
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+#  * Neither the name of the Glue project nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Which itself was based on the solution at
+#
+# https://gist.github.com/cpbotha/1b42a20c8f3eb9bb7cb8
+#
+# which was released under the MIT license:
+#
+# Copyright (c) 2011 Sebastian Wiesner <lunaryorn@gmail.com>
+# Modifications by Charl Botha <cpbotha@vxlabs.com>
+#
+# 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/openpype/vendor/python/common/scriptsmenu/vendor/__init__.py b/openpype/vendor/python/common/scriptsmenu/vendor/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openpype/vendor/python/common/scriptsmenu/version.py b/openpype/vendor/python/common/scriptsmenu/version.py
new file mode 100644
index 0000000000..73f9426c2d
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/version.py
@@ -0,0 +1,9 @@
+VERSION_MAJOR = 1
+VERSION_MINOR = 5
+VERSION_PATCH = 1
+
+
+version = '{}.{}.{}'.format(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
+__version__ = version
+
+__all__ = ['version', '__version__']
diff --git a/openpype/version.py b/openpype/version.py
index 0371d5f4e3..c4bd5a14cb 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.2.0-nightly.5"
+__version__ = "3.3.0-nightly.9"
diff --git a/poetry.lock b/poetry.lock
index 30dbe50c19..e011b781c9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -11,7 +11,7 @@ develop = false
 type = "git"
 url = "https://github.com/pypeclub/acre.git"
 reference = "master"
-resolved_reference = "68784b7eb5b7bb5f409b61ab31d4403878a3e1b7"
+resolved_reference = "55a7c331e6dc5f81639af50ca4a8cc9d73e9273d"
 
 [[package]]
 name = "aiohttp"
diff --git a/repos/avalon-core b/repos/avalon-core
index d8be0bdb37..e5c8a15fde 160000
--- a/repos/avalon-core
+++ b/repos/avalon-core
@@ -1 +1 @@
-Subproject commit d8be0bdb37961e32243f1de0eb9696e86acf7443
+Subproject commit e5c8a15fde77708c924eab3018bda255f17b5390
diff --git a/start.py b/start.py
index 8e7c195e95..6473a926d0 100644
--- a/start.py
+++ b/start.py
@@ -135,18 +135,36 @@ if sys.__stdout__:
     def _print(message: str):
         if message.startswith("!!! "):
             print("{}{}".format(term.orangered2("!!! "), message[4:]))
+            return
         if message.startswith(">>> "):
             print("{}{}".format(term.aquamarine3(">>> "), message[4:]))
+            return
         if message.startswith("--- "):
             print("{}{}".format(term.darkolivegreen3("--- "), message[4:]))
-        if message.startswith("    "):
-            print("{}{}".format(term.darkseagreen3("    "), message[4:]))
+            return
         if message.startswith("*** "):
             print("{}{}".format(term.gold("*** "), message[4:]))
+            return
         if message.startswith("  - "):
             print("{}{}".format(term.wheat("  - "), message[4:]))
+            return
         if message.startswith("  . "):
             print("{}{}".format(term.tan("  . "), message[4:]))
+            return
+        if message.startswith("     - "):
+            print("{}{}".format(term.seagreen3("     - "), message[7:]))
+            return
+        if message.startswith("     ! "):
+            print("{}{}".format(term.goldenrod("     ! "), message[7:]))
+            return
+        if message.startswith("     * "):
+            print("{}{}".format(term.aquamarine1("     * "), message[7:]))
+            return
+        if message.startswith("    "):
+            print("{}{}".format(term.darkseagreen3("    "), message[4:]))
+            return
+
+        print(message)
 else:
     def _print(message: str):
         print(message)
@@ -175,20 +193,42 @@ silent_commands = ["run", "igniter", "standalonepublisher",
                    "extractenvironments"]
 
 
+def list_versions(openpype_versions: list, local_version=None) -> None:
+    """Print list of detected versions."""
+    _print("  - Detected versions:")
+    for v in sorted(openpype_versions):
+        _print(f"     - {v}: {v.path}")
+    if not openpype_versions:
+        _print("     ! none in repository detected")
+    if local_version:
+        _print(f"     * local version {local_version}")
+
+
 def set_openpype_global_environments() -> None:
     """Set global OpenPype's environments."""
     import acre
 
-    from openpype.settings import get_environments
+    try:
+        from openpype.settings import get_general_environments
 
-    all_env = get_environments()
+        general_env = get_general_environments()
 
-    # TODO Global environments will be stored in "general" settings so loading
-    #   will be modified and can be done in igniter.
-    env = acre.merge(
-        acre.parse(all_env["global"]),
+    except Exception:
+        # Backwards compatibility for OpenPype versions where
+        #   `get_general_environments` does not exists yet
+        from openpype.settings import get_environments
+
+        all_env = get_environments()
+        general_env = all_env["global"]
+
+    merged_env = acre.merge(
+        acre.parse(general_env),
         dict(os.environ)
     )
+    env = acre.compute(
+        merged_env,
+        cleanup=False
+    )
     os.environ.clear()
     os.environ.update(env)
 
@@ -303,22 +343,37 @@ def _process_arguments() -> tuple:
     # check for `--use-version=3.0.0` argument and `--use-staging`
     use_version = None
     use_staging = False
+    print_versions = False
     for arg in sys.argv:
         if arg == "--use-version":
             _print("!!! Please use option --use-version like:")
             _print("    --use-version=3.0.0")
             sys.exit(1)
 
-        m = re.search(
-            r"--use-version=(?P<version>\d+\.\d+\.\d+(?:\S*)?)", arg)
-        if m and m.group('version'):
-            use_version = m.group('version')
-            sys.argv.remove(arg)
-            break
+        if arg.startswith("--use-version="):
+            m = re.search(
+                r"--use-version=(?P<version>\d+\.\d+\.\d+(?:\S*)?)", arg)
+            if m and m.group('version'):
+                use_version = m.group('version')
+                _print(">>> Requested version [ {} ]".format(use_version))
+                sys.argv.remove(arg)
+                if "+staging" in use_version:
+                    use_staging = True
+                break
+            else:
+                _print("!!! Requested version isn't in correct format.")
+                _print(("    Use --list-versions to find out"
+                       " proper version string."))
+                sys.exit(1)
+
     if "--use-staging" in sys.argv:
         use_staging = True
         sys.argv.remove("--use-staging")
 
+    if "--list-versions" in sys.argv:
+        print_versions = True
+        sys.argv.remove("--list-versions")
+
     # handle igniter
     # this is helper to run igniter before anything else
     if "igniter" in sys.argv:
@@ -334,7 +389,7 @@ def _process_arguments() -> tuple:
         sys.argv.pop(idx)
         sys.argv.insert(idx, "tray")
 
-    return use_version, use_staging
+    return use_version, use_staging, print_versions
 
 
 def _determine_mongodb() -> str:
@@ -487,7 +542,7 @@ def _find_frozen_openpype(use_version: str = None,
                     openpype_version = openpype_versions[-1]
                 except IndexError:
                     _print(("!!! Something is wrong and we didn't "
-                          "found it again."))
+                            "found it again."))
                     sys.exit(1)
             elif return_code != 2:
                 _print(f"  . finished ({return_code})")
@@ -500,7 +555,7 @@ def _find_frozen_openpype(use_version: str = None,
             _print("*** Still no luck finding OpenPype.")
             _print(("*** We'll try to use the one coming "
                    "with OpenPype installation."))
-        version_path = _bootstrap_from_code(use_version)
+        version_path = _bootstrap_from_code(use_version, use_staging)
         openpype_version = OpenPypeVersion(
             version=BootstrapRepos.get_version(version_path),
             path=version_path)
@@ -519,13 +574,8 @@ def _find_frozen_openpype(use_version: str = None,
         if found:
             openpype_version = sorted(found)[-1]
         if not openpype_version:
-            _print(f"!!! requested version {use_version} was not found.")
-            if openpype_versions:
-                _print("  - found: ")
-                for v in sorted(openpype_versions):
-                    _print(f"     - {v}: {v.path}")
-
-            _print(f"     - local version {local_version}")
+            _print(f"!!! Requested version {use_version} was not found.")
+            list_versions(openpype_versions, local_version)
             sys.exit(1)
 
     # test if latest detected is installed (in user data dir)
@@ -560,7 +610,7 @@ def _find_frozen_openpype(use_version: str = None,
     return openpype_version.path
 
 
-def _bootstrap_from_code(use_version):
+def _bootstrap_from_code(use_version, use_staging):
     """Bootstrap live code (or the one coming with frozen OpenPype.
 
     Args:
@@ -575,15 +625,33 @@ def _bootstrap_from_code(use_version):
     _openpype_root = OPENPYPE_ROOT
     if getattr(sys, 'frozen', False):
         local_version = bootstrap.get_version(Path(_openpype_root))
-        _print(f"  - running version: {local_version}")
+        switch_str = f" - will switch to {use_version}" if use_version else ""
+        _print(f"  - booting version: {local_version}{switch_str}")
         assert local_version
     else:
         # get current version of OpenPype
         local_version = bootstrap.get_local_live_version()
 
-    if use_version and use_version != local_version:
-        version_to_use = None
-        openpype_versions = bootstrap.find_openpype(include_zips=True)
+    version_to_use = None
+    openpype_versions = bootstrap.find_openpype(
+        include_zips=True, staging=use_staging)
+    if use_staging and not use_version:
+        try:
+            version_to_use = openpype_versions[-1]
+        except IndexError:
+            _print("!!! No staging versions are found.")
+            list_versions(openpype_versions, local_version)
+            sys.exit(1)
+        if version_to_use.path.is_file():
+            version_to_use.path = bootstrap.extract_openpype(
+                version_to_use)
+        bootstrap.add_paths_from_directory(version_to_use.path)
+        os.environ["OPENPYPE_VERSION"] = str(version_to_use)
+        version_path = version_to_use.path
+        os.environ["OPENPYPE_REPOS_ROOT"] = (version_path / "openpype").as_posix()  # noqa: E501
+        _openpype_root = version_to_use.path.as_posix()
+
+    elif use_version and use_version != local_version:
         v: OpenPypeVersion
         found = [v for v in openpype_versions if str(v) == use_version]
         if found:
@@ -600,13 +668,8 @@ def _bootstrap_from_code(use_version):
             os.environ["OPENPYPE_REPOS_ROOT"] = (version_path / "openpype").as_posix()  # noqa: E501
             _openpype_root = version_to_use.path.as_posix()
         else:
-            _print(f"!!! requested version {use_version} was not found.")
-            if openpype_versions:
-                _print("  - found: ")
-                for v in sorted(openpype_versions):
-                    _print(f"     - {v}: {v.path}")
-
-            _print(f"     - local version {local_version}")
+            _print(f"!!! Requested version {use_version} was not found.")
+            list_versions(openpype_versions, local_version)
             sys.exit(1)
     else:
         os.environ["OPENPYPE_VERSION"] = local_version
@@ -675,11 +738,16 @@ def boot():
     # Process arguments
     # ------------------------------------------------------------------------
 
-    use_version, use_staging = _process_arguments()
+    use_version, use_staging, print_versions = _process_arguments()
 
     if os.getenv("OPENPYPE_VERSION"):
-        use_staging = "staging" in os.getenv("OPENPYPE_VERSION")
-        use_version = os.getenv("OPENPYPE_VERSION")
+        if use_version:
+            _print(("*** environment variable OPENPYPE_VERSION"
+                    "is overridden by command line argument."))
+        else:
+            _print(">>> version set by environment variable")
+            use_staging = "staging" in os.getenv("OPENPYPE_VERSION")
+            use_version = os.getenv("OPENPYPE_VERSION")
 
     # ------------------------------------------------------------------------
     # Determine mongodb connection
@@ -704,6 +772,24 @@ def boot():
     if not os.getenv("OPENPYPE_PATH") and openpype_path:
         os.environ["OPENPYPE_PATH"] = openpype_path
 
+    if print_versions:
+        if not use_staging:
+            _print("--- This will list only non-staging versions detected.")
+            _print("    To see staging versions, use --use-staging argument.")
+        else:
+            _print("--- This will list only staging versions detected.")
+            _print("    To see other version, omit --use-staging argument.")
+        _openpype_root = OPENPYPE_ROOT
+        openpype_versions = bootstrap.find_openpype(include_zips=True,
+                                                    staging=use_staging)
+        if getattr(sys, 'frozen', False):
+            local_version = bootstrap.get_version(Path(_openpype_root))
+        else:
+            local_version = bootstrap.get_local_live_version()
+
+        list_versions(openpype_versions, local_version)
+        sys.exit(1)
+
     # ------------------------------------------------------------------------
     # Find OpenPype versions
     # ------------------------------------------------------------------------
@@ -718,7 +804,7 @@ def boot():
             _print(f"!!! {e}")
             sys.exit(1)
     else:
-        version_path = _bootstrap_from_code(use_version)
+        version_path = _bootstrap_from_code(use_version, use_staging)
 
     # set this to point either to `python` from venv in case of live code
     # or to `openpype` or `openpype_console` in case of frozen code
@@ -754,7 +840,7 @@ def boot():
     from openpype.version import __version__
 
     assert version_path, "Version path not defined."
-    info = get_info()
+    info = get_info(use_staging)
     info.insert(0, f">>> Using OpenPype from [ {version_path} ]")
 
     t_width = 20
@@ -781,7 +867,7 @@ def boot():
         sys.exit(1)
 
 
-def get_info() -> list:
+def get_info(use_staging=None) -> list:
     """Print additional information to console."""
     from openpype.lib.mongo import get_default_components
     from openpype.lib.log import PypeLogger
@@ -789,7 +875,7 @@ def get_info() -> list:
     components = get_default_components()
 
     inf = []
-    if not getattr(sys, 'frozen', False):
+    if use_staging:
         inf.append(("OpenPype variant", "staging"))
     else:
         inf.append(("OpenPype variant", "production"))
diff --git a/tests/igniter/test_bootstrap_repos.py b/tests/igniter/test_bootstrap_repos.py
index 743131acfa..740a71a5ce 100644
--- a/tests/igniter/test_bootstrap_repos.py
+++ b/tests/igniter/test_bootstrap_repos.py
@@ -330,8 +330,8 @@ def test_find_openpype(fix_bootstrap, tmp_path_factory, monkeypatch, printer):
     assert result[-1].path == expected_path, ("not a latest version of "
                                               "OpenPype 3")
 
+    printer("testing finding OpenPype in OPENPYPE_PATH ...")
     monkeypatch.setenv("OPENPYPE_PATH", e_path.as_posix())
-
     result = fix_bootstrap.find_openpype(include_zips=True)
     # we should have results as file were created
     assert result is not None, "no OpenPype version found"
@@ -349,6 +349,8 @@ def test_find_openpype(fix_bootstrap, tmp_path_factory, monkeypatch, printer):
 
     monkeypatch.delenv("OPENPYPE_PATH", raising=False)
 
+    printer("testing finding OpenPype in user data dir ...")
+
     # mock appdirs user_data_dir
     def mock_user_data_dir(*args, **kwargs):
         """Mock local app data dir."""
@@ -373,18 +375,7 @@ def test_find_openpype(fix_bootstrap, tmp_path_factory, monkeypatch, printer):
     assert result[-1].path == expected_path, ("not a latest version of "
                                               "OpenPype 2")
 
-    result = fix_bootstrap.find_openpype(e_path, include_zips=True)
-    assert result is not None, "no OpenPype version found"
-    expected_path = Path(
-        e_path / "{}{}{}".format(
-            test_versions_1[5].prefix,
-            test_versions_1[5].version,
-            test_versions_1[5].suffix
-        )
-    )
-    assert result[-1].path == expected_path, ("not a latest version of "
-                                              "OpenPype 1")
-
+    printer("testing finding OpenPype zip/dir precedence ...")
     result = fix_bootstrap.find_openpype(dir_path, include_zips=True)
     assert result is not None, "no OpenPype versions found"
     expected_path = Path(
diff --git a/tools/build.ps1 b/tools/build.ps1
index c8c2f392ad..10da3d0b83 100644
--- a/tools/build.ps1
+++ b/tools/build.ps1
@@ -80,12 +80,6 @@ function Show-PSWarning() {
     }
 }
 
-function Install-Poetry() {
-    Write-Host ">>> " -NoNewline -ForegroundColor Green
-    Write-Host "Installing Poetry ... "
-    (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python -
-}
-
 $art = @"
 
              . .   ..     .    ..
@@ -115,11 +109,9 @@ $openpype_root = (Get-Item $script_dir).parent.FullName
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
-# make sure Poetry is in PATH
 if (-not (Test-Path 'env:POETRY_HOME')) {
     $env:POETRY_HOME = "$openpype_root\.poetry"
 }
-$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
 
 Set-Location -Path $openpype_root
 
@@ -164,7 +156,7 @@ Write-Host " ]" -ForegroundColor white
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Write-Host "*** " -NoNewline -ForegroundColor Yellow
     Write-Host "We need to install Poetry create virtual env first ..."
@@ -184,10 +176,10 @@ Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "Building OpenPype ..."
 $startTime = [int][double]::Parse((Get-Date -UFormat %s))
 
-$out = & poetry run python setup.py build 2>&1
+$out = &  "$($env:POETRY_HOME)\bin\poetry" run python setup.py build 2>&1
+Set-Content -Path "$($openpype_root)\build\build.log" -Value $out
 if ($LASTEXITCODE -ne 0)
 {
-    Set-Content -Path "$($openpype_root)\build\build.log" -Value $out
     Write-Host "!!! " -NoNewLine -ForegroundColor Red
     Write-Host "Build failed. Check the log: " -NoNewline
     Write-Host ".\build\build.log" -ForegroundColor Yellow
@@ -195,7 +187,7 @@ if ($LASTEXITCODE -ne 0)
 }
 
 Set-Content -Path "$($openpype_root)\build\build.log" -Value $out
-& poetry run python "$($openpype_root)\tools\build_dependencies.py"
+& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\tools\build_dependencies.py"
 
 Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "restoring current directory"
diff --git a/tools/build.sh b/tools/build.sh
index aa8f0121ea..c44e7157af 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -140,21 +140,6 @@ realpath () {
   echo $(cd $(dirname "$1") || return; pwd)/$(basename "$1")
 }
 
-##############################################################################
-# Install Poetry when needed
-# Globals:
-#   PATH
-# Arguments:
-#   None
-# Returns:
-#   None
-###############################################################################
-install_poetry () {
-  echo -e "${BIGreen}>>>${RST} Installing Poetry ..."
-  command -v curl >/dev/null 2>&1 || { echo -e "${BIRed}!!!${RST}${BIYellow} Missing ${RST}${BIBlue}curl${BIYellow} command.${RST}"; return 1; }
-  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-}
-
 # Main
 main () {
   echo -e "${BGreen}"
@@ -171,11 +156,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIYellow}---${RST} Cleaning build directory ..."
   rm -rf "$openpype_root/build" && mkdir "$openpype_root/build" > /dev/null
@@ -201,11 +184,11 @@ if [ "$disable_submodule_update" == 1 ]; then
   fi
   echo -e "${BIGreen}>>>${RST} Building ..."
   if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    poetry run python "$openpype_root/setup.py" build > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
+    "$POETRY_HOME/bin/poetry" run python "$openpype_root/setup.py" build > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
   elif [[ "$OSTYPE" == "darwin"* ]]; then
-    poetry run python "$openpype_root/setup.py" bdist_mac > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
+    "$POETRY_HOME/bin/poetry" run python "$openpype_root/setup.py" bdist_mac > "$openpype_root/build/build.log" || { echo -e "${BIRed}!!!${RST} Build failed, see the build log."; return; }
   fi
-  poetry run python "$openpype_root/tools/build_dependencies.py"
+  "$POETRY_HOME/bin/poetry" run python "$openpype_root/tools/build_dependencies.py"
 
   if [[ "$OSTYPE" == "darwin"* ]]; then
     # fix code signing issue
diff --git a/tools/build_win_installer.ps1 b/tools/build_win_installer.ps1
index 05ec0f9823..a0832e0135 100644
--- a/tools/build_win_installer.ps1
+++ b/tools/build_win_installer.ps1
@@ -64,14 +64,6 @@ function Show-PSWarning() {
     }
 }
 
-function Install-Poetry() {
-    Write-Host ">>> " -NoNewline -ForegroundColor Green
-    Write-Host "Installing Poetry ... "
-    (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python -
-    # add it to PATH
-    $env:PATH = "$($env:PATH);$($env:USERPROFILE)\.poetry\bin"
-}
-
 $art = @"
 
              . .   ..     .    ..
diff --git a/tools/create_env.ps1 b/tools/create_env.ps1
index 94a91ce48f..f19a98f11b 100644
--- a/tools/create_env.ps1
+++ b/tools/create_env.ps1
@@ -48,17 +48,36 @@ function Show-PSWarning() {
 function Install-Poetry() {
     Write-Host ">>> " -NoNewline -ForegroundColor Green
     Write-Host "Installing Poetry ... "
+    $python = "python"
+    if (Get-Command "pyenv" -ErrorAction SilentlyContinue) {
+        if (-not (Test-Path -PathType Leaf -Path "$($openpype_root)\.python-version")) {
+            $result = & pyenv global
+            if ($result -eq "no global version configured") {
+                Write-Host "!!! " -NoNewline -ForegroundColor Red
+                Write-Host "Using pyenv but having no local or global version of Python set."
+                Exit-WithCode 1
+            }
+        }
+        $python = & pyenv which python
+        
+    }
+
     $env:POETRY_HOME="$openpype_root\.poetry"
-    (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python -
-    # add it to PATH
-    $env:PATH = "$($env:PATH);$openpype_root\.poetry\bin"
+    (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py -UseBasicParsing).Content | & $($python) -
 }
 
 
 function Test-Python() {
     Write-Host ">>> " -NoNewline -ForegroundColor green
     Write-Host "Detecting host Python ... " -NoNewline
-    if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
+    $python = "python"
+    if (Get-Command "pyenv" -ErrorAction SilentlyContinue) {
+        $pyenv_python = & pyenv which python
+        if (Test-Path -PathType Leaf -Path "$($pyenv_python)") {
+            $python = $pyenv_python
+        }
+    }
+    if (-not (Get-Command $python -ErrorAction SilentlyContinue)) {
         Write-Host "!!! Python not detected" -ForegroundColor red
         Set-Location -Path $current_dir
         Exit-WithCode 1
@@ -68,7 +87,7 @@ import sys
 print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))
 '@
 
-    $p = & python -c $version_command
+    $p = & $python -c $version_command
     $env:PYTHON_VERSION = $p
     $m = $p -match '(\d+)\.(\d+)'
     if(-not $m) {
@@ -94,11 +113,10 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
-# make sure Poetry is in PATH
 if (-not (Test-Path 'env:POETRY_HOME')) {
     $env:POETRY_HOME = "$openpype_root\.poetry"
 }
-$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
 
 Set-Location -Path $openpype_root
 
@@ -145,7 +163,7 @@ Test-Python
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Install-Poetry
     Write-Host "INSTALLED" -ForegroundColor Cyan
@@ -160,7 +178,7 @@ if (-not (Test-Path -PathType Leaf -Path "$($openpype_root)\poetry.lock")) {
     Write-Host ">>> " -NoNewline -ForegroundColor green
     Write-Host "Installing virtual environment from lock."
 }
-& poetry install --no-root $poetry_verbosity
+& "$env:POETRY_HOME\bin\poetry" install --no-root $poetry_verbosity --ansi
 if ($LASTEXITCODE -ne 0) {
     Write-Host "!!! " -ForegroundColor yellow -NoNewline
     Write-Host "Poetry command failed."
diff --git a/tools/create_env.sh b/tools/create_env.sh
index 226a26e199..cc9eddc317 100755
--- a/tools/create_env.sh
+++ b/tools/create_env.sh
@@ -109,8 +109,7 @@ install_poetry () {
   echo -e "${BIGreen}>>>${RST} Installing Poetry ..."
   export POETRY_HOME="$openpype_root/.poetry"
   command -v curl >/dev/null 2>&1 || { echo -e "${BIRed}!!!${RST}${BIYellow} Missing ${RST}${BIBlue}curl${BIYellow} command.${RST}"; return 1; }
-  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-  export PATH="$PATH:$POETRY_HOME/bin"
+  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python -
 }
 
 ##############################################################################
@@ -154,11 +153,10 @@ main () {
 
   # Directories
   openpype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}")))
-  # make sure Poetry is in PATH
+
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
 
   pushd "$openpype_root" > /dev/null || return > /dev/null
@@ -177,7 +175,7 @@ main () {
     echo -e "${BIGreen}>>>${RST} Installing dependencies ..."
   fi
 
-  poetry install --no-root $poetry_verbosity || { echo -e "${BIRed}!!!${RST} Poetry environment installation failed"; return; }
+  "$POETRY_HOME/bin/poetry" install --no-root $poetry_verbosity || { echo -e "${BIRed}!!!${RST} Poetry environment installation failed"; return; }
 
   echo -e "${BIGreen}>>>${RST} Cleaning cache files ..."
   clean_pyc
@@ -186,10 +184,10 @@ main () {
   # cx_freeze will crash on missing __pychache__ on these but
   # reinstalling them solves the problem.
   echo -e "${BIGreen}>>>${RST} Fixing pycache bug ..."
-  poetry run python -m pip install --force-reinstall pip
-  poetry run pip install --force-reinstall setuptools
-  poetry run pip install --force-reinstall wheel
-  poetry run python -m pip install --force-reinstall pip
+  "$POETRY_HOME/bin/poetry" run python -m pip install --force-reinstall pip
+  "$POETRY_HOME/bin/poetry" run pip install --force-reinstall setuptools
+  "$POETRY_HOME/bin/poetry" run pip install --force-reinstall wheel
+  "$POETRY_HOME/bin/poetry" run python -m pip install --force-reinstall pip
 }
 
 main -3
diff --git a/tools/create_zip.ps1 b/tools/create_zip.ps1
index 1a7520eb11..c27857b480 100644
--- a/tools/create_zip.ps1
+++ b/tools/create_zip.ps1
@@ -45,11 +45,9 @@ $openpype_root = (Get-Item $script_dir).parent.FullName
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
-# make sure Poetry is in PATH
 if (-not (Test-Path 'env:POETRY_HOME')) {
     $env:POETRY_HOME = "$openpype_root\.poetry"
 }
-$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
 
 Set-Location -Path $openpype_root
 
@@ -87,7 +85,7 @@ if (-not $openpype_version) {
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Write-Host "*** " -NoNewline -ForegroundColor Yellow
     Write-Host "We need to install Poetry create virtual env first ..."
@@ -107,5 +105,5 @@ Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "Generating zip from current sources ..."
 $env:PYTHONPATH="$($openpype_root);$($env:PYTHONPATH)"
 $env:OPENPYPE_ROOT="$($openpype_root)"
-& poetry run python "$($openpype_root)\tools\create_zip.py" $ARGS
+& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\tools\create_zip.py" $ARGS
 Set-Location -Path $current_dir
diff --git a/tools/create_zip.sh b/tools/create_zip.sh
index ec0276b040..85ee18a839 100755
--- a/tools/create_zip.sh
+++ b/tools/create_zip.sh
@@ -114,11 +114,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
@@ -134,7 +132,7 @@ main () {
   echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..."
   PYTHONPATH="$openpype_root:$PYTHONPATH"
   OPENPYPE_ROOT="$openpype_root"
-  poetry run python3 "$openpype_root/tools/create_zip.py" "$@"
+  "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/tools/create_zip.py" "$@"
 }
 
 main "$@"
diff --git a/tools/fetch_thirdparty_libs.ps1 b/tools/fetch_thirdparty_libs.ps1
index 23f0b50c7a..16f7b70e7a 100644
--- a/tools/fetch_thirdparty_libs.ps1
+++ b/tools/fetch_thirdparty_libs.ps1
@@ -17,18 +17,15 @@ $openpype_root = (Get-Item $script_dir).parent.FullName
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
-# make sure Poetry is in PATH
 if (-not (Test-Path 'env:POETRY_HOME')) {
     $env:POETRY_HOME = "$openpype_root\.poetry"
 }
-$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
 
 Set-Location -Path $openpype_root
 
-
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Write-Host "*** " -NoNewline -ForegroundColor Yellow
     Write-Host "We need to install Poetry create virtual env first ..."
@@ -37,5 +34,5 @@ if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
     Write-Host "OK" -ForegroundColor Green
 }
 
-& poetry run python "$($openpype_root)\tools\fetch_thirdparty_libs.py"
+& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\tools\fetch_thirdparty_libs.py"
 Set-Location -Path $current_dir
diff --git a/tools/fetch_thirdparty_libs.sh b/tools/fetch_thirdparty_libs.sh
index 31f109ba68..93d0674965 100755
--- a/tools/fetch_thirdparty_libs.sh
+++ b/tools/fetch_thirdparty_libs.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-# Run Pype Tray
-
-
 art () {
   cat <<-EOF
 
@@ -82,11 +79,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
   if [ -f "$POETRY_HOME/bin/poetry" ]; then
@@ -100,7 +95,7 @@ main () {
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running Pype tool ..."
-  poetry run python "$openpype_root/tools/fetch_thirdparty_libs.py"
+  "$POETRY_HOME/bin/poetry" run python "$openpype_root/tools/fetch_thirdparty_libs.py"
 }
 
 main
\ No newline at end of file
diff --git a/tools/make_docs.ps1 b/tools/make_docs.ps1
index 2f9350eff0..45a11171ae 100644
--- a/tools/make_docs.ps1
+++ b/tools/make_docs.ps1
@@ -19,11 +19,9 @@ $openpype_root = (Get-Item $script_dir).parent.FullName
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
-# make sure Poetry is in PATH
 if (-not (Test-Path 'env:POETRY_HOME')) {
     $env:POETRY_HOME = "$openpype_root\.poetry"
 }
-$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
 
 Set-Location -Path $openpype_root
 
@@ -50,7 +48,7 @@ Write-Host $art -ForegroundColor DarkGreen
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Write-Host "*** " -NoNewline -ForegroundColor Yellow
     Write-Host "We need to install Poetry create virtual env first ..."
@@ -63,10 +61,10 @@ Write-Host "This will not overwrite existing source rst files, only scan and add
 Set-Location -Path $openpype_root
 Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "Running apidoc ..."
-& poetry run sphinx-apidoc -M -e -d 10  --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($openpype_root)\docs\source" igniter
-& poetry run sphinx-apidoc.exe -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($openpype_root)\docs\source" openpype vendor, openpype\vendor
+& "$env:POETRY_HOME\bin\poetry" run sphinx-apidoc -M -e -d 10  --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($openpype_root)\docs\source" igniter
+& "$env:POETRY_HOME\bin\poetry" run sphinx-apidoc.exe -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($openpype_root)\docs\source" openpype vendor, openpype\vendor
 
 Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "Building html ..."
-& poetry run python "$($openpype_root)\setup.py" build_sphinx
+& "$env:POETRY_HOME\bin\poetry" run python "$($openpype_root)\setup.py" build_sphinx
 Set-Location -Path $current_dir
diff --git a/tools/make_docs.sh b/tools/make_docs.sh
index 9dfab26a38..52ee57dcf0 100755
--- a/tools/make_docs.sh
+++ b/tools/make_docs.sh
@@ -83,11 +83,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
   if [ -f "$POETRY_HOME/bin/poetry" ]; then
@@ -101,11 +99,11 @@ main () {
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running apidoc ..."
-  poetry run sphinx-apidoc -M -e -d 10  --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" igniter
-  poetry run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" openpype vendor, openpype\vendor
+  "$POETRY_HOME/bin/poetry" run sphinx-apidoc -M -e -d 10  --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" igniter
+  "$POETRY_HOME/bin/poetry" run sphinx-apidoc -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$openpype_root/docs/source" openpype vendor, openpype\vendor
 
   echo -e "${BIGreen}>>>${RST} Building html ..."
-  poetry run python3 "$openpype_root/setup.py" build_sphinx
+  "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/setup.py" build_sphinx
 }
 
 main
diff --git a/tools/run_mongo.ps1 b/tools/run_mongo.ps1
index 6719e520fe..32f6cfed17 100644
--- a/tools/run_mongo.ps1
+++ b/tools/run_mongo.ps1
@@ -41,22 +41,40 @@ function Exit-WithCode($exitcode) {
 }
 
 
-function Find-Mongo {
+function Find-Mongo ($preferred_version) {
     $defaultPath = "C:\Program Files\MongoDB\Server"
     Write-Host ">>> " -NoNewLine -ForegroundColor Green
     Write-Host "Detecting MongoDB ... " -NoNewline
     if (-not (Get-Command "mongod" -ErrorAction SilentlyContinue)) {
         if(Test-Path "$($defaultPath)\*\bin\mongod.exe" -PathType Leaf) {
         # we have mongo server installed on standard Windows location
-        # so we can inject it to the PATH. We'll use latest version available.
+        # so we can inject it to the PATH. We'll use latest version available, or the one defined by
+        # $preferred_version.
         $mongoVersions = Get-ChildItem -Directory 'C:\Program Files\MongoDB\Server' | Sort-Object -Property {$_.Name -as [int]}
         if(Test-Path "$($mongoVersions[-1])\bin\mongod.exe" -PathType Leaf) {
-            $env:PATH = "$($env:PATH);$($mongoVersions[-1])\bin\"
             Write-Host "OK" -ForegroundColor Green
+            $use_version = $mongoVersions[-1]
+            foreach ($v in $mongoVersions) {
+                Write-Host "  - found [ " -NoNewline
+                Write-Host $v -NoNewLine -ForegroundColor Cyan
+                Write-Host " ]" -NoNewLine
+
+                $version = Split-Path $v -Leaf
+
+                if ($preferred_version -eq $version) {
+                    Write-Host " *" -ForegroundColor Green
+                    $use_version = $v
+                } else {
+                    Write-Host ""
+                }
+            }
+
+            $env:PATH = "$($env:PATH);$($use_version)\bin\"
+
             Write-Host "  - auto-added from [ " -NoNewline
-            Write-Host "$($mongoVersions[-1])\bin\mongod.exe" -NoNewLine -ForegroundColor Cyan
+            Write-Host "$($use_version)\bin\mongod.exe" -NoNewLine -ForegroundColor Cyan
             Write-Host " ]"
-            return "$($mongoVersions[-1])\bin\mongod.exe"
+            return "$($use_version)\bin\mongod.exe"
         } else {
             Write-Host "FAILED " -NoNewLine -ForegroundColor Red
             Write-Host "MongoDB not detected" -ForegroundColor Yellow
@@ -95,7 +113,18 @@ $port = 2707
 # path to database
 $dbpath = (Get-Item $openpype_root).parent.FullName + "\mongo_db_data"
 
-$mongoPath = Find-Mongo
-Start-Process -FilePath $mongopath "--dbpath $($dbpath) --port $($port)" -PassThru
+$preferred_version = "4.0"
 
+$mongoPath = Find-Mongo $preferred_version
+Write-Host ">>> " -NoNewLine -ForegroundColor Green
+Write-Host "Using DB path: " -NoNewLine
+Write-Host " [ " -NoNewline -ForegroundColor Cyan
+Write-Host "$($dbpath)" -NoNewline -ForegroundColor White
+Write-Host " ] "-ForegroundColor Cyan
+Write-Host ">>> " -NoNewLine -ForegroundColor Green
+Write-Host "Port: " -NoNewLine
+Write-Host " [ " -NoNewline -ForegroundColor Cyan
+Write-Host "$($port)" -NoNewline -ForegroundColor White
+Write-Host " ] " -ForegroundColor Cyan
+Start-Process -FilePath $mongopath "--dbpath $($dbpath) --port $($port)" -PassThru | Out-Null
 
diff --git a/tools/run_project_manager.ps1 b/tools/run_project_manager.ps1
index 9886a80316..a9cfbb1e7b 100644
--- a/tools/run_project_manager.ps1
+++ b/tools/run_project_manager.ps1
@@ -47,7 +47,7 @@ Set-Location -Path $openpype_root
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Write-Host "*** " -NoNewline -ForegroundColor Yellow
     Write-Host "We need to install Poetry create virtual env first ..."
@@ -56,5 +56,5 @@ if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
     Write-Host "OK" -ForegroundColor Green
 }
 
-& poetry run python "$($openpype_root)\start.py" projectmanager
+& "$env:POETRY_HOME\bin\poetry" run python "$($openpype_root)\start.py" projectmanager
 Set-Location -Path $current_dir
diff --git a/tools/run_projectmanager.sh b/tools/run_projectmanager.sh
index 312f321d67..b5c858c34a 100755
--- a/tools/run_projectmanager.sh
+++ b/tools/run_projectmanager.sh
@@ -79,11 +79,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
@@ -97,7 +95,7 @@ main () {
   fi
 
   echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..."
-  poetry run python "$openpype_root/start.py" projectmanager
+  "$POETRY_HOME/bin/poetry" run python "$openpype_root/start.py" projectmanager
 }
 
 main
diff --git a/tools/run_settings.ps1 b/tools/run_settings.ps1
index 7477e546b3..1c0aa6e8f3 100644
--- a/tools/run_settings.ps1
+++ b/tools/run_settings.ps1
@@ -27,7 +27,7 @@ Set-Location -Path $openpype_root
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Write-Host "*** " -NoNewline -ForegroundColor Yellow
     Write-Host "We need to install Poetry create virtual env first ..."
@@ -36,5 +36,5 @@ if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
     Write-Host "OK" -ForegroundColor Green
 }
 
-& poetry run python "$($openpype_root)\start.py" settings --dev
+& "$env:POETRY_HOME\bin\poetry" run python "$($openpype_root)\start.py" settings --dev
 Set-Location -Path $current_dir
\ No newline at end of file
diff --git a/tools/run_settings.sh b/tools/run_settings.sh
index 0287043bb6..5a465dce2c 100755
--- a/tools/run_settings.sh
+++ b/tools/run_settings.sh
@@ -79,11 +79,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
@@ -97,7 +95,7 @@ main () {
   fi
 
   echo -e "${BIGreen}>>>${RST} Generating zip from current sources ..."
-  poetry run python3 "$openpype_root/start.py" settings --dev
+  "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/start.py" settings --dev
 }
 
 main
diff --git a/tools/run_tests.ps1 b/tools/run_tests.ps1
index a6882e2a09..e631cb72df 100644
--- a/tools/run_tests.ps1
+++ b/tools/run_tests.ps1
@@ -59,11 +59,9 @@ $openpype_root = (Get-Item $script_dir).parent.FullName
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
-# make sure Poetry is in PATH
 if (-not (Test-Path 'env:POETRY_HOME')) {
     $env:POETRY_HOME = "$openpype_root\.poetry"
 }
-$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
 
 Set-Location -Path $openpype_root
 
@@ -83,7 +81,7 @@ Write-Host " ] ..." -ForegroundColor white
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Write-Host "*** " -NoNewline -ForegroundColor Yellow
     Write-Host "We need to install Poetry create virtual env first ..."
@@ -102,7 +100,7 @@ Write-Host ">>> " -NoNewline -ForegroundColor green
 Write-Host "Testing OpenPype ..."
 $original_pythonpath = $env:PYTHONPATH
 $env:PYTHONPATH="$($openpype_root);$($env:PYTHONPATH)"
-& poetry run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$($openpype_root)/tests"
+& "$env:POETRY_HOME\bin\poetry" run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$($openpype_root)/tests"
 $env:PYTHONPATH = $original_pythonpath
 
 Write-Host ">>> " -NoNewline -ForegroundColor green
diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index 90977edc83..8f8f82fd9c 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -98,11 +98,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-  # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
   if [ -f "$POETRY_HOME/bin/poetry" ]; then
@@ -118,7 +116,7 @@ main () {
   echo -e "${BIGreen}>>>${RST} Testing OpenPype ..."
   original_pythonpath=$PYTHONPATH
   export PYTHONPATH="$openpype_root:$PYTHONPATH"
-  poetry run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$openpype_root/tests"
+  "$POETRY_HOME/bin/poetry" run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$openpype_root/tests"
   PYTHONPATH=$original_pythonpath
 }
 
diff --git a/tools/run_tray.ps1 b/tools/run_tray.ps1
index 533a791836..872c1524a6 100644
--- a/tools/run_tray.ps1
+++ b/tools/run_tray.ps1
@@ -26,7 +26,7 @@ Set-Location -Path $openpype_root
 
 Write-Host ">>> " -NoNewline -ForegroundColor Green
 Write-Host "Reading Poetry ... " -NoNewline
-if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "NOT FOUND" -ForegroundColor Yellow
     Write-Host "*** " -NoNewline -ForegroundColor Yellow
     Write-Host "We need to install Poetry create virtual env first ..."
@@ -35,5 +35,5 @@ if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
     Write-Host "OK" -ForegroundColor Green
 }
 
-& poetry run python "$($openpype_root)\start.py" tray --debug
+& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\start.py" tray --debug
 Set-Location -Path $current_dir
\ No newline at end of file
diff --git a/tools/run_tray.sh b/tools/run_tray.sh
index 339ff6f918..2eb9886063 100755
--- a/tools/run_tray.sh
+++ b/tools/run_tray.sh
@@ -56,11 +56,9 @@ main () {
 
   _inside_openpype_tool="1"
 
-   # make sure Poetry is in PATH
   if [[ -z $POETRY_HOME ]]; then
     export POETRY_HOME="$openpype_root/.poetry"
   fi
-  export PATH="$POETRY_HOME/bin:$PATH"
 
   echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"
   if [ -f "$POETRY_HOME/bin/poetry" ]; then
@@ -74,7 +72,7 @@ main () {
   pushd "$openpype_root" > /dev/null || return > /dev/null
 
   echo -e "${BIGreen}>>>${RST} Running OpenPype Tray with debug option ..."
-  poetry run python3 "$openpype_root/start.py" tray --debug
+  "$POETRY_HOME/bin/poetry" run python3 "$openpype_root/start.py" tray --debug
 }
 
 main
\ No newline at end of file
diff --git a/website/docs/admin_hosts_maya.md b/website/docs/admin_hosts_maya.md
index 83c4121be9..05a231c21a 100644
--- a/website/docs/admin_hosts_maya.md
+++ b/website/docs/admin_hosts_maya.md
@@ -4,11 +4,11 @@ title: Maya
 sidebar_label: Maya
 ---
 
-## Maya
+## Publish Plugins
 
-### Publish Plugins
+### Render Settings Validator 
 
-#### Render Settings Validator (`ValidateRenderSettings`)
+`ValidateRenderSettings`
 
 Render Settings Validator is here to make sure artists will submit renders
 we correct settings. Some of these settings are needed by OpenPype but some
@@ -49,4 +49,74 @@ Arnolds Camera (AA) samples to 6.
 Note that `aiOptions` is not the name of node but rather its type. For renderers there is usually
 just one instance of this node type but if that is not so, validator will go through all its
 instances and check the value there. Node type for **VRay** settings is `VRaySettingsNode`, for **Renderman**
-it is `rmanGlobals`, for **Redshift** it is `RedshiftOptions`.
\ No newline at end of file
+it is `rmanGlobals`, for **Redshift** it is `RedshiftOptions`.
+
+### Model Name Validator 
+
+`ValidateRenderSettings`
+
+This validator can enforce specific names for model members. It will check them against **Validation Regex**.
+There is special group in that regex - **shader**. If present, it will take that part of the name as shader name
+and it will compare it with list of shaders defined either in file name specified in **Material File** or from
+database file that is per project and can be directly edited from Maya's *OpenPype Tools > Edit Shader name definitions* when
+**Use database shader name definitions** is on. This list defines simply as one shader name per line.
+
+![Settings example](assets/maya-admin_model_name_validator.png)
+
+For example - you are using default regex `(.*)_(\d)*_(?P<shader>.*)_(GEO)` and you have two shaders defined
+in either file or database `foo` and `bar`.
+
+Object named `SomeCube_0001_foo_GEO` will pass but `SomeCube_GEO` will not and `SomeCube_001_xxx_GEO` will not too.
+
+#### Top level group name
+There is a validation for top level group name too. You can specify whatever regex you'd like to use. Default will
+pass everything with `_GRP` suffix. You can use *named capturing groups* to validate against specific data. If you
+put `(?P<asset>.*)` it will try to match everything captured in that group against current asset name. Likewise you can
+use it for **subset** and **project** - `(?P<subset>.*)` and `(?P<project>.*)`.
+
+**Example**
+
+You are working on asset (shot) `0030_OGC_0190`. You have this regex in **Top level group name**:
+```regexp
+.*?_(?P<asset>.*)_GRP
+```
+
+When you publish your model with top group named like `foo_GRP` it will fail. But with `foo_0030_OGC_0190_GRP` it will pass.
+
+:::info About regex
+All regexes used here are in Python variant.
+:::
+
+### Maya > Deadline submitter
+This plugin provides connection between Maya and Deadline. It is using [Deadline Webservice](https://docs.thinkboxsoftware.com/products/deadline/10.0/1_User%20Manual/manual/web-service.html) to submit jobs to farm.
+![Maya > Deadline Settings](assets/maya-admin_submit_maya_job_to_deadline.png)
+
+You can set various aspects of scene submission to farm with per-project settings in **Setting UI**.
+
+ - **Optional** will mark sumission plugin optional
+ - **Active** will enable/disable plugin
+ - **Tile Assembler Plugin** will set what should be used to assemble tiles on Deadline. Either **Open Image IO** will be used 
+or Deadlines **Draft Tile Assembler**.
+ - **Use Published scene** enable to render from published scene instead of scene in work area. Rendering from published files is much safer.
+ - **Use Asset dependencies** will mark job pending on farm until asset dependencies are fulfilled - for example Deadline will wait for scene file to be synced to cloud, etc.
+ - **Group name** use specific Deadline group for the job.
+ - **Limit Groups** use these Deadline Limit groups for the job.
+ - **Additional `JobInfo` data** JSON of additional Deadline options that will be embedded in `JobInfo` part of the submission data.
+ - **Additional `PluginInfo` data** JSON of additional Deadline options that will be embedded in `PluginInfo` part of the submission data.
+ - **Scene patches** - configure mechanism to add additional lines to published Maya Ascii scene files before they are used for rendering.
+This is useful to fix some specific renderer glitches and advanced hacking of Maya Scene files. `Patch name` is label for patch for easier orientation.
+`Patch regex` is regex used to find line in file, after `Patch line` string is inserted. Note that you need to add line ending.
+
+## Custom Menu
+You can add your custom tools menu into Maya by extending definitions in **Maya -> Scripts Menu Definition**.
+![Custom menu definition](assets/maya-admin_scriptsmenu.png)
+
+:::note Work in progress
+This is still work in progress. Menu definition will be handled more friendly with widgets and not
+raw json.
+:::
+
+## Multiplatform path mapping
+You can configure path mapping using Maya `dirmap` command. This will add bi-directional mapping between
+list of paths specified in **Settings**. You can find it in **Settings -> Project Settings -> Maya -> Maya Directory Mapping**
+![Dirmap settings](assets/maya-admin_dirmap_settings.png)
diff --git a/website/docs/admin_openpype_commands.md b/website/docs/admin_openpype_commands.md
index 324e0e8481..1a91e2e7fe 100644
--- a/website/docs/admin_openpype_commands.md
+++ b/website/docs/admin_openpype_commands.md
@@ -21,6 +21,8 @@ openpype_console --use-version=3.0.0-foo+bar
 
 `--use-staging` - to use staging versions of OpenPype.
 
+`--list-versions [--use-staging]` - to list available versions.
+
 For more information [see here](admin_use#run-openpype).
 
 ## Commands
diff --git a/website/docs/admin_use.md b/website/docs/admin_use.md
index 4a2b56e6f4..4ad08a0174 100644
--- a/website/docs/admin_use.md
+++ b/website/docs/admin_use.md
@@ -46,6 +46,16 @@ openpype_console --use-version=3.0.1
 `--use-staging` - to specify you prefer staging version. In that case it will be used
 (if found) instead of production one.
 
+:::tip List available versions
+To list all available versions, use:
+
+```shell
+openpype_console --list-versions
+```
+
+You can add `--use-staging` to list staging versions.
+:::
+
 ### Details
 When you run OpenPype from executable, few check are made: 
 
diff --git a/website/docs/artist_hosts_aftereffects.md b/website/docs/artist_hosts_aftereffects.md
index 879c0d4646..fffc6302b7 100644
--- a/website/docs/artist_hosts_aftereffects.md
+++ b/website/docs/artist_hosts_aftereffects.md
@@ -22,7 +22,7 @@ Drag extension.zxp and drop it to Anastasyi's Extension Manager. The extension w
 ## Implemented functionality
 
 AfterEffects implementation currently allows you to import and add various media to composition (image plates, renders, audio files, video files etc.)
-and send prepared composition for rendering to Deadline. 
+and send prepared composition for rendering to Deadline or render locally. 
 
 ## Usage
 
@@ -53,6 +53,12 @@ will be changed.
 
 ### Publish
 
+#### RenderQueue
+
+AE's Render Queue is required for publishing locally or on a farm. Artist needs to configure expected result format (extension, resolution) in the Render Queue in an Output module. Currently its expected to have only single render item and single output module in the Render Queue.
+
+AE might throw some warning windows during publishing locally, so please pay attention to them in a case publishing seems to be stuck in a `Extract Local Render`.
+
 When you are ready to share your work, you will need to publish it. This is done by opening the `Publish` by clicking the corresponding button in the OpenPype Panel.
 
 ![Publish](assets/aftereffects_publish.png) 
diff --git a/website/docs/assets/maya-admin_dirmap_settings.png b/website/docs/assets/maya-admin_dirmap_settings.png
new file mode 100644
index 0000000000..9d5780dfc8
Binary files /dev/null and b/website/docs/assets/maya-admin_dirmap_settings.png differ
diff --git a/website/docs/assets/maya-admin_model_name_validator.png b/website/docs/assets/maya-admin_model_name_validator.png
new file mode 100644
index 0000000000..d1b92c5fc3
Binary files /dev/null and b/website/docs/assets/maya-admin_model_name_validator.png differ
diff --git a/website/docs/assets/maya-admin_scriptsmenu.png b/website/docs/assets/maya-admin_scriptsmenu.png
new file mode 100644
index 0000000000..ecfe7e42a7
Binary files /dev/null and b/website/docs/assets/maya-admin_scriptsmenu.png differ
diff --git a/website/docs/assets/maya-admin_submit_maya_job_to_deadline.png b/website/docs/assets/maya-admin_submit_maya_job_to_deadline.png
new file mode 100644
index 0000000000..56b720dc5d
Binary files /dev/null and b/website/docs/assets/maya-admin_submit_maya_job_to_deadline.png differ
diff --git a/website/docs/dev_build.md b/website/docs/dev_build.md
index 2c4bd1e9af..b3e0c24fc2 100644
--- a/website/docs/dev_build.md
+++ b/website/docs/dev_build.md
@@ -137,12 +137,12 @@ $ pyenv install -v 3.7.10
 $ cd /path/to/pype-3
 
 # set local python version
-$ pyenv local 3.7.9
+$ pyenv local 3.7.10
 ```
 :::note Install build requirements for **Ubuntu**
 
 ```shell
-sudo apt-get update; sudo apt-get install --no-install-recommends make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev git
+sudo apt-get update; sudo apt-get install --no-install-recommends make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev git patchelf
 ```
 
 In case you run in error about `xcb` when running Pype,
diff --git a/website/docs/module_ftrack.md b/website/docs/module_ftrack.md
index c3b9fd6bc2..005270b3b9 100644
--- a/website/docs/module_ftrack.md
+++ b/website/docs/module_ftrack.md
@@ -34,7 +34,7 @@ To prepare Ftrack for working with OpenPype you'll need to run [OpenPype Admin -
 Ftrack Event Server is the key to automation of many tasks like _status change_, _thumbnail update_, _automatic synchronization to Avalon database_ and many more. Event server should run at all times to perform the required processing as it is not possible to catch some of them retrospectively with enough certainty.
 
 ### Running event server
-There are specific launch arguments for event server. With `openpype eventserver` you can launch event server but without prior preparation it will terminate immediately. The reason is that event server requires 3 pieces of information: _Ftrack server url_, _paths to events_ and _credentials (Username and API key)_. Ftrack server URL and Event path are set from OpenPype's environments by default, but the credentials must be done separatelly for security reasons.
+There are specific launch arguments for event server. With `openpype_console eventserver` you can launch event server but without prior preparation it will terminate immediately. The reason is that event server requires 3 pieces of information: _Ftrack server url_, _paths to events_ and _credentials (Username and API key)_. Ftrack server URL and Event path are set from OpenPype's environments by default, but the credentials must be done separatelly for security reasons.
 
 
 
@@ -56,7 +56,7 @@ There are specific launch arguments for event server. With `openpype eventserver
 -   `--ftrack-url "https://yourdomain.ftrackapp.com/"` : Ftrack server URL _(it is not needed to enter if you have set `FTRACK_SERVER` in OpenPype' environments)_
 -   `--ftrack-events-path "//Paths/To/Events/"` : Paths to events folder. May contain multiple paths separated by `;`. _(it is not needed to enter if you have set `FTRACK_EVENTS_PATH` in OpenPype' environments)_
 
-So if you want to use OpenPype's environments then you can launch event server for first time with these arguments `openpype.exe eventserver --ftrack-user "my.username" --ftrack-api-key "00000aaa-11bb-22cc-33dd-444444eeeee" --store-credentials`. Since that time, if everything was entered correctly, you can launch event server with `openpype.exe eventserver`.
+So if you want to use OpenPype's environments then you can launch event server for first time with these arguments `openpype_console.exe eventserver --ftrack-user "my.username" --ftrack-api-key "00000aaa-11bb-22cc-33dd-444444eeeee" --store-credentials`. Since that time, if everything was entered correctly, you can launch event server with `openpype_console.exe eventserver`.
 
 </TabItem>
 <TabItem value="env">
@@ -100,14 +100,17 @@ Event server should **not** run more than once! It may cause major issues.
 <TabItem value="linux">
 
 - create file:
-    `sudo vi /opt/OpenPype/run_event_server.sh`
+    `sudo vi /opt/openpype/run_event_server.sh`
 -   add content to the file:
 ```sh
-#!\usr\bin\env
+#!/usr/bin/env
 export OPENPYPE_DEBUG=3
 pushd /mnt/pipeline/prod/openpype-setup
-. openpype eventserver --ftrack-user <openpype-admin-user> --ftrack-api-key <api-key>
+. openpype_console eventserver --ftrack-user <openpype-admin-user> --ftrack-api-key <api-key>
 ```
+-   change file permission:
+    `sudo chmod 0755 /opt/openpype/run_event_server.sh`
+
 -   create service file:
     `sudo vi /etc/systemd/system/openpype-ftrack-event-server.service`
 -   add content to the service file
@@ -145,7 +148,7 @@ WantedBy=multi-user.target
 @echo off
 set OPENPYPE_DEBUG=3
 pushd \\path\to\file\
-call openpype.bat eventserver --ftrack-user <openpype-admin-user> --ftrack-api-key <api-key> 
+openpype_console.exe eventserver --ftrack-user <openpype-admin-user> --ftrack-api-key <api-key> 
 ```
 -   download and install `nssm.cc`
 -   create Windows service according to nssm.cc manual
diff --git a/website/docs/project_settings/assets/standalone_creators.png b/website/docs/project_settings/assets/standalone_creators.png
new file mode 100644
index 0000000000..cfadfa305d
Binary files /dev/null and b/website/docs/project_settings/assets/standalone_creators.png differ
diff --git a/website/docs/project_settings/settings_project_standalone.md b/website/docs/project_settings/settings_project_standalone.md
new file mode 100644
index 0000000000..b359dc70d0
--- /dev/null
+++ b/website/docs/project_settings/settings_project_standalone.md
@@ -0,0 +1,98 @@
+---
+id: settings_project_standalone
+title: Project Standalone Publisher Setting
+sidebar_label: Standalone Publisher
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+Project settings can have project specific values. Each new project is using studio values defined in **default** project but these values can be modified or overriden per project.
+
+:::warning Default studio values
+Projects always use default project values unless they have [project override](../admin_settings#project-overrides) (orage colour). Any changes in default project may affect all existing projects.
+:::
+
+## Creator Plugins
+
+Contains list of implemented families to show in middle menu in Standalone Publisher. Each plugin must contain:
+- name
+- label
+- family
+- icon
+- default subset(s)
+- help (additional short information about family)
+
+![example of creator plugin](assets/standalone_creators.png)
+
+## Publish plugins
+
+### Collect Textures
+
+Serves to collect all needed information about workfiles and textures created from those. Allows to publish 
+main workfile (for example from Mari), additional worfiles (from Substance Painter) and exported textures.
+
+Available configuration:
+- Main workfile extension - only single workfile can be "main" one
+- Support workfile extensions - additional workfiles will be published to same folder as "main", just under `resourses` subfolder
+- Texture extension - what kind of formats are expected for textures
+- Additional families for workfile - should any family ('ftrack', 'review') be added to published workfile
+- Additional families for textures - should any family ('ftrack', 'review') be added to published textures
+
+#### Naming conventions
+
+Implementation tries to be flexible and cover multiple naming conventions for workfiles and textures.
+
+##### Workfile naming pattern
+
+Provide regex matching pattern containing regex groups used to parse workfile name to learn needed information. (For example
+build name.)
+
+Example:
+
+- pattern: ```^([^.]+)(_[^_.]*)?_v([0-9]{3,}).+``` 
+- with groups: ```["asset", "filler", "version"]```
+  
+parses `corridorMain_v001` into three groups:
+- asset build (`corridorMain`)
+- filler (in this case empty)
+- version (`001`)
+
+Advanced example (for texture files):
+
+- pattern: ```^([^_.]+)_([^_.]+)_v([0-9]{3,})_([^_.]+)_({color_space})_(1[0-9]{3}).+``` 
+- with groups: ```["asset", "shader", "version", "channel", "color_space", "udim"]```
+  
+parses `corridorMain_aluminiumID_v001_baseColor_linsRGB_1001.exr`:
+- asset build (`corridorMain`)
+- shader (`aluminiumID`)
+- version (`001`)
+- channel (`baseColor`)
+- color_space (`linsRGB`)
+- udim (`1001`)
+
+
+In case of different naming pattern, additional groups could be added or removed. Number of matching groups (`(...)`) must be same as number of items in `Group order for regex patterns`
+
+##### Workfile group positions
+
+For each matching regex group set in previous paragraph, its ordinal position is required (in case of need for addition of new groups etc.)
+
+Number of groups added here must match number of parsing groups from `Workfile naming pattern`.
+
+##### Output names
+
+Output names of published workfiles and textures could be configured separately:
+- Subset name template for workfile
+- Subset name template for textures (implemented keys: ["color_space", "channel", "subset", "shader"])
+
+
+### Validate Scene Settings
+
+#### Check Frame Range for Extensions
+
+Configure families, file extension and task to validate that DB setting (frame range) matches currently published values.
+
+### ExtractThumbnailSP
+
+Plugin responsible for generating thumbnails, configure appropriate values for your version o ffmpeg.
\ No newline at end of file
diff --git a/website/sidebars.js b/website/sidebars.js
index d38973e40f..488814a385 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -65,7 +65,8 @@ module.exports = {
                     label: "Project Settings",
                     items: [
                         "project_settings/settings_project_global",
-                        "project_settings/settings_project_nuke"
+                        "project_settings/settings_project_nuke",
+                        "project_settings/settings_project_standalone"
                     ],
                 },
             ],
diff --git a/website/static/img/logos/pypeclub_black.svg b/website/static/img/logos/pypeclub_black.svg
index b749edbdb3..6c209977fe 100644
--- a/website/static/img/logos/pypeclub_black.svg
+++ b/website/static/img/logos/pypeclub_black.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="100%" height="100%" viewBox="0 0 582 151" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-654,-2331)">
-        <g id="pypeclub_black" transform="matrix(0.775972,0,0,0.911492,654.799,1794.12)">
+    <g transform="matrix(1,0,0,1,-987,-2015)">
+        <g id="pypeclub_black" transform="matrix(0.775972,0,0,0.911492,987.586,1477.95)">
             <rect x="0" y="589.923" width="748.802" height="164.565" style="fill:none;"/>
             <g transform="matrix(2.7183,0,0,1.24969,-3.76111,624.796)">
                 <g id="PYPE" transform="matrix(1,0,0,1,-105.172,0)">
@@ -20,7 +20,21 @@
                     </g>
                 </g>
                 <g transform="matrix(0.474085,0,0,0.877899,142.749,-0.167247)">
-                    <text x="2.312px" y="79.899px" style="font-family:'Poppins-Light', 'Poppins';font-weight:300;font-size:100px;">.club</text>
+                    <g transform="matrix(100,0,0,100,2.312,79.8987)">
+                        <path d="M0.092,0.005C0.077,0.005 0.065,-0 0.056,-0.01C0.046,-0.02 0.041,-0.032 0.041,-0.047C0.041,-0.062 0.046,-0.074 0.056,-0.084C0.065,-0.093 0.077,-0.098 0.092,-0.098C0.106,-0.098 0.118,-0.093 0.128,-0.084C0.137,-0.074 0.142,-0.062 0.142,-0.047C0.142,-0.032 0.137,-0.02 0.128,-0.01C0.118,-0 0.106,0.005 0.092,0.005Z" style="fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,20.5107,79.8987)">
+                        <path d="M0.048,-0.273C0.048,-0.33 0.059,-0.379 0.082,-0.422C0.105,-0.464 0.136,-0.497 0.176,-0.52C0.216,-0.543 0.262,-0.554 0.313,-0.554C0.38,-0.554 0.436,-0.537 0.48,-0.504C0.523,-0.471 0.551,-0.425 0.564,-0.368L0.489,-0.368C0.48,-0.407 0.46,-0.438 0.429,-0.461C0.398,-0.483 0.359,-0.494 0.313,-0.494C0.276,-0.494 0.243,-0.486 0.214,-0.469C0.185,-0.452 0.162,-0.428 0.145,-0.395C0.128,-0.362 0.119,-0.321 0.119,-0.273C0.119,-0.225 0.128,-0.184 0.145,-0.151C0.162,-0.118 0.185,-0.093 0.214,-0.076C0.243,-0.059 0.276,-0.051 0.313,-0.051C0.359,-0.051 0.398,-0.062 0.429,-0.085C0.46,-0.107 0.48,-0.138 0.489,-0.178L0.564,-0.178C0.551,-0.122 0.523,-0.077 0.479,-0.043C0.435,-0.009 0.38,0.008 0.313,0.008C0.262,0.008 0.216,-0.004 0.176,-0.027C0.136,-0.05 0.105,-0.082 0.082,-0.125C0.059,-0.167 0.048,-0.216 0.048,-0.273Z" style="fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,81.8095,79.8987)">
+                        <rect x="0.08" y="-0.74" width="0.07" height="0.74" style="fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,104.708,79.8987)">
+                        <path d="M0.553,-0.546L0.553,-0L0.483,-0L0.483,-0.096C0.467,-0.062 0.442,-0.036 0.409,-0.018C0.376,-0 0.338,0.009 0.297,0.009C0.232,0.009 0.178,-0.011 0.137,-0.051C0.096,-0.092 0.075,-0.15 0.075,-0.227L0.075,-0.546L0.144,-0.546L0.144,-0.235C0.144,-0.176 0.159,-0.13 0.189,-0.099C0.218,-0.068 0.259,-0.052 0.31,-0.052C0.363,-0.052 0.405,-0.069 0.436,-0.102C0.467,-0.135 0.483,-0.184 0.483,-0.249L0.483,-0.546L0.553,-0.546Z" style="fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,168.007,79.8987)">
+                        <path d="M0.149,-0.425C0.167,-0.463 0.195,-0.494 0.233,-0.518C0.27,-0.542 0.315,-0.554 0.366,-0.554C0.416,-0.554 0.461,-0.543 0.5,-0.52C0.539,-0.497 0.57,-0.464 0.593,-0.422C0.615,-0.379 0.626,-0.33 0.626,-0.274C0.626,-0.218 0.615,-0.169 0.593,-0.126C0.57,-0.083 0.539,-0.05 0.5,-0.027C0.46,-0.004 0.415,0.008 0.366,0.008C0.314,0.008 0.269,-0.004 0.232,-0.028C0.194,-0.051 0.166,-0.082 0.149,-0.12L0.149,-0L0.08,-0L0.08,-0.74L0.149,-0.74L0.149,-0.425ZM0.555,-0.274C0.555,-0.319 0.546,-0.359 0.529,-0.392C0.511,-0.425 0.487,-0.45 0.456,-0.467C0.425,-0.484 0.391,-0.493 0.352,-0.493C0.315,-0.493 0.281,-0.484 0.25,-0.466C0.219,-0.448 0.194,-0.422 0.176,-0.389C0.158,-0.356 0.149,-0.317 0.149,-0.273C0.149,-0.229 0.158,-0.19 0.176,-0.157C0.194,-0.124 0.219,-0.098 0.25,-0.08C0.281,-0.062 0.315,-0.053 0.352,-0.053C0.391,-0.053 0.425,-0.062 0.456,-0.08C0.487,-0.097 0.511,-0.123 0.529,-0.157C0.546,-0.19 0.555,-0.229 0.555,-0.274Z" style="fill-rule:nonzero;"/>
+                    </g>
                 </g>
             </g>
         </g>
diff --git a/website/static/img/logos/pypeclub_color_white.svg b/website/static/img/logos/pypeclub_color_white.svg
index c82946d82b..ffa194aa47 100644
--- a/website/static/img/logos/pypeclub_color_white.svg
+++ b/website/static/img/logos/pypeclub_color_white.svg
@@ -1,26 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="100%" height="100%" viewBox="0 0 582 151" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-35,-2135)">
-        <g id="pypeclub_color_white" transform="matrix(0.775972,0,0,0.911492,35.6167,1597.77)">
+    <g transform="matrix(1,0,0,1,-987,-1797)">
+        <g id="pypeclub_color_white" transform="matrix(0.775972,0,0,0.911492,987.586,1259.42)">
             <rect x="0" y="589.923" width="748.802" height="164.565" style="fill:none;"/>
             <g transform="matrix(2.7183,0,0,1.24969,-3.76111,624.796)">
                 <g id="PYPE" transform="matrix(1,0,0,1,-105.172,0)">
                     <g transform="matrix(47.4085,0,0,87.7899,124.81,70.8632)">
-                        <path d="M0.629,-0.465C0.629,-0.42 0.619,-0.38 0.598,-0.344C0.577,-0.307 0.547,-0.278 0.506,-0.257C0.466,-0.236 0.417,-0.225 0.36,-0.225L0.272,-0.225L0.272,-0.05C0.272,-0.037 0.267,-0.024 0.257,-0.015C0.248,-0.005 0.235,0 0.222,0L0.1,0C0.072,0 0.05,-0.022 0.05,-0.05L0.05,-0.658C0.05,-0.686 0.072,-0.708 0.1,-0.708L0.36,-0.708C0.447,-0.708 0.513,-0.686 0.56,-0.642C0.606,-0.598 0.629,-0.539 0.629,-0.465ZM0.335,-0.4C0.381,-0.4 0.404,-0.422 0.404,-0.465C0.404,-0.508 0.381,-0.53 0.335,-0.53L0.272,-0.53L0.272,-0.4L0.335,-0.4Z" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
+                        <path d="M0.629,-0.465C0.629,-0.42 0.619,-0.38 0.598,-0.344C0.577,-0.307 0.547,-0.278 0.506,-0.257C0.466,-0.236 0.417,-0.225 0.36,-0.225L0.272,-0.225L0.272,-0.05C0.272,-0.037 0.267,-0.024 0.257,-0.015C0.248,-0.005 0.235,0 0.222,0L0.1,-0C0.072,0 0.05,-0.022 0.05,-0.05L0.05,-0.658C0.05,-0.686 0.072,-0.708 0.1,-0.708L0.36,-0.708C0.447,-0.708 0.513,-0.686 0.56,-0.642C0.606,-0.598 0.629,-0.539 0.629,-0.465ZM0.335,-0.4C0.381,-0.4 0.404,-0.422 0.404,-0.465C0.404,-0.508 0.381,-0.53 0.335,-0.53L0.272,-0.53L0.272,-0.4L0.335,-0.4Z" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
                     </g>
                     <g transform="matrix(47.4085,0,0,87.7899,155.577,70.8632)">
-                        <path d="M0.648,-0.708C0.665,-0.708 0.682,-0.699 0.691,-0.684C0.7,-0.669 0.7,-0.651 0.692,-0.635C0.622,-0.498 0.476,-0.215 0.476,-0.215L0.476,-0.05C0.476,-0.022 0.454,0 0.426,0L0.304,0C0.276,0 0.254,-0.022 0.254,-0.05L0.254,-0.215C0.254,-0.215 0.108,-0.498 0.038,-0.635C0.03,-0.651 0.03,-0.669 0.039,-0.684C0.048,-0.699 0.065,-0.708 0.082,-0.708L0.222,-0.708C0.241,-0.708 0.259,-0.696 0.267,-0.679C0.297,-0.612 0.367,-0.457 0.367,-0.457C0.367,-0.457 0.437,-0.612 0.467,-0.679C0.475,-0.696 0.493,-0.708 0.512,-0.708L0.648,-0.708Z" style="fill:url(#_Linear2);fill-rule:nonzero;"/>
+                        <path d="M0.648,-0.708C0.665,-0.708 0.682,-0.699 0.691,-0.684C0.7,-0.669 0.7,-0.651 0.692,-0.635C0.622,-0.498 0.476,-0.215 0.476,-0.215L0.476,-0.05C0.476,-0.022 0.454,0 0.426,0L0.304,-0C0.276,0 0.254,-0.022 0.254,-0.05L0.254,-0.215C0.254,-0.215 0.108,-0.498 0.038,-0.635C0.03,-0.651 0.03,-0.669 0.039,-0.684C0.048,-0.699 0.065,-0.708 0.082,-0.708L0.222,-0.708C0.241,-0.708 0.259,-0.696 0.267,-0.679C0.297,-0.612 0.367,-0.457 0.367,-0.457C0.367,-0.457 0.437,-0.612 0.467,-0.679C0.475,-0.696 0.493,-0.708 0.512,-0.708L0.648,-0.708Z" style="fill:url(#_Linear2);fill-rule:nonzero;"/>
                     </g>
                     <g transform="matrix(47.4085,0,0,87.7899,190.185,70.8632)">
-                        <path d="M0.629,-0.465C0.629,-0.42 0.619,-0.38 0.598,-0.344C0.577,-0.307 0.547,-0.278 0.506,-0.257C0.466,-0.236 0.417,-0.225 0.36,-0.225L0.272,-0.225L0.272,-0.05C0.272,-0.037 0.267,-0.024 0.257,-0.015C0.248,-0.005 0.235,0 0.222,0L0.1,0C0.072,0 0.05,-0.022 0.05,-0.05L0.05,-0.658C0.05,-0.686 0.072,-0.708 0.1,-0.708L0.36,-0.708C0.447,-0.708 0.513,-0.686 0.56,-0.642C0.606,-0.598 0.629,-0.539 0.629,-0.465ZM0.335,-0.4C0.381,-0.4 0.404,-0.422 0.404,-0.465C0.404,-0.508 0.381,-0.53 0.335,-0.53L0.272,-0.53L0.272,-0.4L0.335,-0.4Z" style="fill:url(#_Linear3);fill-rule:nonzero;"/>
+                        <path d="M0.629,-0.465C0.629,-0.42 0.619,-0.38 0.598,-0.344C0.577,-0.307 0.547,-0.278 0.506,-0.257C0.466,-0.236 0.417,-0.225 0.36,-0.225L0.272,-0.225L0.272,-0.05C0.272,-0.037 0.267,-0.024 0.257,-0.015C0.248,-0.005 0.235,0 0.222,0L0.1,-0C0.072,0 0.05,-0.022 0.05,-0.05L0.05,-0.658C0.05,-0.686 0.072,-0.708 0.1,-0.708L0.36,-0.708C0.447,-0.708 0.513,-0.686 0.56,-0.642C0.606,-0.598 0.629,-0.539 0.629,-0.465ZM0.335,-0.4C0.381,-0.4 0.404,-0.422 0.404,-0.465C0.404,-0.508 0.381,-0.53 0.335,-0.53L0.272,-0.53L0.272,-0.4L0.335,-0.4Z" style="fill:url(#_Linear3);fill-rule:nonzero;"/>
                     </g>
                     <g transform="matrix(47.4085,0,0,87.7899,220.953,70.8632)">
                         <path d="M0.272,-0.531L0.272,-0.444L0.492,-0.444L0.492,-0.277L0.272,-0.277L0.272,-0.177L0.472,-0.177C0.485,-0.177 0.498,-0.172 0.507,-0.162C0.517,-0.153 0.522,-0.14 0.522,-0.127L0.522,-0.05C0.522,-0.037 0.517,-0.024 0.507,-0.015C0.498,-0.005 0.485,0 0.472,-0L0.1,0C0.072,0 0.05,-0.022 0.05,-0.05L0.05,-0.658C0.05,-0.686 0.072,-0.708 0.1,-0.708L0.472,-0.708C0.485,-0.708 0.498,-0.703 0.507,-0.693C0.517,-0.684 0.522,-0.671 0.522,-0.658L0.522,-0.581C0.522,-0.568 0.517,-0.555 0.507,-0.546C0.498,-0.536 0.485,-0.531 0.472,-0.531L0.272,-0.531Z" style="fill:url(#_Linear4);fill-rule:nonzero;"/>
                     </g>
                 </g>
                 <g transform="matrix(0.474085,0,0,0.877899,142.749,-0.167247)">
-                    <text x="2.312px" y="79.899px" style="font-family:'Poppins-Light', 'Poppins';font-weight:300;font-size:100px;fill:white;">.club</text>
+                    <g transform="matrix(100,0,0,100,2.312,79.8987)">
+                        <path d="M0.092,0.005C0.077,0.005 0.065,-0 0.056,-0.01C0.046,-0.02 0.041,-0.032 0.041,-0.047C0.041,-0.062 0.046,-0.074 0.056,-0.084C0.065,-0.093 0.077,-0.098 0.092,-0.098C0.106,-0.098 0.118,-0.093 0.128,-0.084C0.137,-0.074 0.142,-0.062 0.142,-0.047C0.142,-0.032 0.137,-0.02 0.128,-0.01C0.118,-0 0.106,0.005 0.092,0.005Z" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,20.5107,79.8987)">
+                        <path d="M0.048,-0.273C0.048,-0.33 0.059,-0.379 0.082,-0.422C0.105,-0.464 0.136,-0.497 0.176,-0.52C0.216,-0.543 0.262,-0.554 0.313,-0.554C0.38,-0.554 0.436,-0.537 0.48,-0.504C0.523,-0.471 0.551,-0.425 0.564,-0.368L0.489,-0.368C0.48,-0.407 0.46,-0.438 0.429,-0.461C0.398,-0.483 0.359,-0.494 0.313,-0.494C0.276,-0.494 0.243,-0.486 0.214,-0.469C0.185,-0.452 0.162,-0.428 0.145,-0.395C0.128,-0.362 0.119,-0.321 0.119,-0.273C0.119,-0.225 0.128,-0.184 0.145,-0.151C0.162,-0.118 0.185,-0.093 0.214,-0.076C0.243,-0.059 0.276,-0.051 0.313,-0.051C0.359,-0.051 0.398,-0.062 0.429,-0.085C0.46,-0.107 0.48,-0.138 0.489,-0.178L0.564,-0.178C0.551,-0.122 0.523,-0.077 0.479,-0.043C0.435,-0.009 0.38,0.008 0.313,0.008C0.262,0.008 0.216,-0.004 0.176,-0.027C0.136,-0.05 0.105,-0.082 0.082,-0.125C0.059,-0.167 0.048,-0.216 0.048,-0.273Z" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,81.8095,79.8987)">
+                        <rect x="0.08" y="-0.74" width="0.07" height="0.74" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,104.708,79.8987)">
+                        <path d="M0.553,-0.546L0.553,-0L0.483,-0L0.483,-0.096C0.467,-0.062 0.442,-0.036 0.409,-0.018C0.376,-0 0.338,0.009 0.297,0.009C0.232,0.009 0.178,-0.011 0.137,-0.051C0.096,-0.092 0.075,-0.15 0.075,-0.227L0.075,-0.546L0.144,-0.546L0.144,-0.235C0.144,-0.176 0.159,-0.13 0.189,-0.099C0.218,-0.068 0.259,-0.052 0.31,-0.052C0.363,-0.052 0.405,-0.069 0.436,-0.102C0.467,-0.135 0.483,-0.184 0.483,-0.249L0.483,-0.546L0.553,-0.546Z" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,168.007,79.8987)">
+                        <path d="M0.149,-0.425C0.167,-0.463 0.195,-0.494 0.233,-0.518C0.27,-0.542 0.315,-0.554 0.366,-0.554C0.416,-0.554 0.461,-0.543 0.5,-0.52C0.539,-0.497 0.57,-0.464 0.593,-0.422C0.615,-0.379 0.626,-0.33 0.626,-0.274C0.626,-0.218 0.615,-0.169 0.593,-0.126C0.57,-0.083 0.539,-0.05 0.5,-0.027C0.46,-0.004 0.415,0.008 0.366,0.008C0.314,0.008 0.269,-0.004 0.232,-0.028C0.194,-0.051 0.166,-0.082 0.149,-0.12L0.149,-0L0.08,-0L0.08,-0.74L0.149,-0.74L0.149,-0.425ZM0.555,-0.274C0.555,-0.319 0.546,-0.359 0.529,-0.392C0.511,-0.425 0.487,-0.45 0.456,-0.467C0.425,-0.484 0.391,-0.493 0.352,-0.493C0.315,-0.493 0.281,-0.484 0.25,-0.466C0.219,-0.448 0.194,-0.422 0.176,-0.389C0.158,-0.356 0.149,-0.317 0.149,-0.273C0.149,-0.229 0.158,-0.19 0.176,-0.157C0.194,-0.124 0.219,-0.098 0.25,-0.08C0.281,-0.062 0.315,-0.053 0.352,-0.053C0.391,-0.053 0.425,-0.062 0.456,-0.08C0.487,-0.097 0.511,-0.123 0.529,-0.157C0.546,-0.19 0.555,-0.229 0.555,-0.274Z" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
                 </g>
             </g>
         </g>
diff --git a/website/static/img/logos/pypeclub_white.svg b/website/static/img/logos/pypeclub_white.svg
index b634c210b1..3bf4159f9c 100644
--- a/website/static/img/logos/pypeclub_white.svg
+++ b/website/static/img/logos/pypeclub_white.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="100%" height="100%" viewBox="0 0 582 151" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,-654,-2135)">
-        <g id="pypeclub_color_white" transform="matrix(0.775972,0,0,0.911492,654.799,1597.77)">
+    <g transform="matrix(1,0,0,1,-987,-2234)">
+        <g id="pypeclub_white" transform="matrix(0.775972,0,0,0.911492,987.586,1696.48)">
             <rect x="0" y="589.923" width="748.802" height="164.565" style="fill:none;"/>
             <g transform="matrix(2.7183,0,0,1.24969,-3.76111,624.796)">
                 <g id="PYPE" transform="matrix(1,0,0,1,-105.172,0)">
@@ -20,7 +20,21 @@
                     </g>
                 </g>
                 <g transform="matrix(0.474085,0,0,0.877899,142.749,-0.167247)">
-                    <text x="2.312px" y="79.899px" style="font-family:'Poppins-Light', 'Poppins';font-weight:300;font-size:100px;fill:white;">.club</text>
+                    <g transform="matrix(100,0,0,100,2.312,79.8987)">
+                        <path d="M0.092,0.005C0.077,0.005 0.065,-0 0.056,-0.01C0.046,-0.02 0.041,-0.032 0.041,-0.047C0.041,-0.062 0.046,-0.074 0.056,-0.084C0.065,-0.093 0.077,-0.098 0.092,-0.098C0.106,-0.098 0.118,-0.093 0.128,-0.084C0.137,-0.074 0.142,-0.062 0.142,-0.047C0.142,-0.032 0.137,-0.02 0.128,-0.01C0.118,-0 0.106,0.005 0.092,0.005Z" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,20.5107,79.8987)">
+                        <path d="M0.048,-0.273C0.048,-0.33 0.059,-0.379 0.082,-0.422C0.105,-0.464 0.136,-0.497 0.176,-0.52C0.216,-0.543 0.262,-0.554 0.313,-0.554C0.38,-0.554 0.436,-0.537 0.48,-0.504C0.523,-0.471 0.551,-0.425 0.564,-0.368L0.489,-0.368C0.48,-0.407 0.46,-0.438 0.429,-0.461C0.398,-0.483 0.359,-0.494 0.313,-0.494C0.276,-0.494 0.243,-0.486 0.214,-0.469C0.185,-0.452 0.162,-0.428 0.145,-0.395C0.128,-0.362 0.119,-0.321 0.119,-0.273C0.119,-0.225 0.128,-0.184 0.145,-0.151C0.162,-0.118 0.185,-0.093 0.214,-0.076C0.243,-0.059 0.276,-0.051 0.313,-0.051C0.359,-0.051 0.398,-0.062 0.429,-0.085C0.46,-0.107 0.48,-0.138 0.489,-0.178L0.564,-0.178C0.551,-0.122 0.523,-0.077 0.479,-0.043C0.435,-0.009 0.38,0.008 0.313,0.008C0.262,0.008 0.216,-0.004 0.176,-0.027C0.136,-0.05 0.105,-0.082 0.082,-0.125C0.059,-0.167 0.048,-0.216 0.048,-0.273Z" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,81.8095,79.8987)">
+                        <rect x="0.08" y="-0.74" width="0.07" height="0.74" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,104.708,79.8987)">
+                        <path d="M0.553,-0.546L0.553,-0L0.483,-0L0.483,-0.096C0.467,-0.062 0.442,-0.036 0.409,-0.018C0.376,-0 0.338,0.009 0.297,0.009C0.232,0.009 0.178,-0.011 0.137,-0.051C0.096,-0.092 0.075,-0.15 0.075,-0.227L0.075,-0.546L0.144,-0.546L0.144,-0.235C0.144,-0.176 0.159,-0.13 0.189,-0.099C0.218,-0.068 0.259,-0.052 0.31,-0.052C0.363,-0.052 0.405,-0.069 0.436,-0.102C0.467,-0.135 0.483,-0.184 0.483,-0.249L0.483,-0.546L0.553,-0.546Z" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
+                    <g transform="matrix(100,0,0,100,168.007,79.8987)">
+                        <path d="M0.149,-0.425C0.167,-0.463 0.195,-0.494 0.233,-0.518C0.27,-0.542 0.315,-0.554 0.366,-0.554C0.416,-0.554 0.461,-0.543 0.5,-0.52C0.539,-0.497 0.57,-0.464 0.593,-0.422C0.615,-0.379 0.626,-0.33 0.626,-0.274C0.626,-0.218 0.615,-0.169 0.593,-0.126C0.57,-0.083 0.539,-0.05 0.5,-0.027C0.46,-0.004 0.415,0.008 0.366,0.008C0.314,0.008 0.269,-0.004 0.232,-0.028C0.194,-0.051 0.166,-0.082 0.149,-0.12L0.149,-0L0.08,-0L0.08,-0.74L0.149,-0.74L0.149,-0.425ZM0.555,-0.274C0.555,-0.319 0.546,-0.359 0.529,-0.392C0.511,-0.425 0.487,-0.45 0.456,-0.467C0.425,-0.484 0.391,-0.493 0.352,-0.493C0.315,-0.493 0.281,-0.484 0.25,-0.466C0.219,-0.448 0.194,-0.422 0.176,-0.389C0.158,-0.356 0.149,-0.317 0.149,-0.273C0.149,-0.229 0.158,-0.19 0.176,-0.157C0.194,-0.124 0.219,-0.098 0.25,-0.08C0.281,-0.062 0.315,-0.053 0.352,-0.053C0.391,-0.053 0.425,-0.062 0.456,-0.08C0.487,-0.097 0.511,-0.123 0.529,-0.157C0.546,-0.19 0.555,-0.229 0.555,-0.274Z" style="fill:white;fill-rule:nonzero;"/>
+                    </g>
                 </g>
             </g>
         </g>