diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 509168278c..4324d321dc 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -15,7 +15,7 @@ from math import ceil
 from six import string_types
 
 from maya import cmds, mel
-import maya.api.OpenMaya as om
+from maya.api import OpenMaya
 
 from openpype.client import (
     get_project,
@@ -403,9 +403,9 @@ def lsattrs(attrs):
 
     """
 
-    dep_fn = om.MFnDependencyNode()
-    dag_fn = om.MFnDagNode()
-    selection_list = om.MSelectionList()
+    dep_fn = OpenMaya.MFnDependencyNode()
+    dag_fn = OpenMaya.MFnDagNode()
+    selection_list = OpenMaya.MSelectionList()
 
     first_attr = next(iter(attrs))
 
@@ -419,7 +419,7 @@ def lsattrs(attrs):
     matches = set()
     for i in range(selection_list.length()):
         node = selection_list.getDependNode(i)
-        if node.hasFn(om.MFn.kDagNode):
+        if node.hasFn(OpenMaya.MFn.kDagNode):
             fn_node = dag_fn.setObject(node)
             full_path_names = [path.fullPathName()
                                for path in fn_node.getAllPaths()]
@@ -868,11 +868,11 @@ def maintained_selection_api():
     Warning: This is *not* added to the undo stack.
 
     """
-    original = om.MGlobal.getActiveSelectionList()
+    original = OpenMaya.MGlobal.getActiveSelectionList()
     try:
         yield
     finally:
-        om.MGlobal.setActiveSelectionList(original)
+        OpenMaya.MGlobal.setActiveSelectionList(original)
 
 
 @contextlib.contextmanager
@@ -1282,11 +1282,11 @@ def get_id(node):
     if node is None:
         return
 
-    sel = om.MSelectionList()
+    sel = OpenMaya.MSelectionList()
     sel.add(node)
 
     api_node = sel.getDependNode(0)
-    fn = om.MFnDependencyNode(api_node)
+    fn = OpenMaya.MFnDependencyNode(api_node)
 
     if not fn.hasAttribute("cbId"):
         return
@@ -3341,15 +3341,15 @@ def iter_visible_nodes_in_range(nodes, start, end):
     @memodict
     def get_visibility_mplug(node):
         """Return api 2.0 MPlug with cached memoize decorator"""
-        sel = om.MSelectionList()
+        sel = OpenMaya.MSelectionList()
         sel.add(node)
         dag = sel.getDagPath(0)
-        return om.MFnDagNode(dag).findPlug("visibility", True)
+        return OpenMaya.MFnDagNode(dag).findPlug("visibility", True)
 
     @contextlib.contextmanager
     def dgcontext(mtime):
         """MDGContext context manager"""
-        context = om.MDGContext(mtime)
+        context = OpenMaya.MDGContext(mtime)
         try:
             previous = context.makeCurrent()
             yield context
@@ -3358,9 +3358,9 @@ def iter_visible_nodes_in_range(nodes, start, end):
 
     # We skip the first frame as we already used that frame to check for
     # overall visibilities. And end+1 to include the end frame.
-    scene_units = om.MTime.uiUnit()
+    scene_units = OpenMaya.MTime.uiUnit()
     for frame in range(start + 1, end + 1):
-        mtime = om.MTime(frame, unit=scene_units)
+        mtime = OpenMaya.MTime(frame, unit=scene_units)
 
         # Build little cache so we don't query the same MPlug's value
         # again if it was checked on this frame and also is a dependency
@@ -3509,3 +3509,56 @@ def write_xgen_file(data, filepath):
 
     with open(filepath, "w") as f:
         f.writelines(lines)
+
+
+def get_color_management_preferences():
+    """Get and resolve OCIO preferences."""
+    data = {
+        # Is color management enabled.
+        "enabled": cmds.colorManagementPrefs(
+            query=True, cmEnabled=True
+        ),
+        "rendering_space": cmds.colorManagementPrefs(
+            query=True, renderingSpaceName=True
+        ),
+        "output_transform": cmds.colorManagementPrefs(
+            query=True, outputTransformName=True
+        ),
+        "output_transform_enabled": cmds.colorManagementPrefs(
+            query=True, outputTransformEnabled=True
+        ),
+        "view_transform": cmds.colorManagementPrefs(
+            query=True, viewTransformName=True
+        )
+    }
+
+    # Split view and display from view_transform. view_transform comes in
+    # format of "{view} ({display})".
+    regex = re.compile(r"^(?P<view>.+) \((?P<display>.+)\)$")
+    match = regex.match(data["view_transform"])
+    data.update({
+        "display": match.group("display"),
+        "view": match.group("view")
+    })
+
+    # Get config absolute path.
+    path = cmds.colorManagementPrefs(
+        query=True, configFilePath=True
+    )
+
+    # The OCIO config supports a custom <MAYA_RESOURCES> token.
+    maya_resources_token = "<MAYA_RESOURCES>"
+    maya_resources_path = OpenMaya.MGlobal.getAbsolutePathToResources()
+    path = path.replace(maya_resources_token, maya_resources_path)
+
+    data["config"] = path
+
+    return data
+
+
+def get_color_management_output_transform():
+    preferences = get_color_management_preferences()
+    colorspace = preferences["rendering_space"]
+    if preferences["output_transform_enabled"]:
+        colorspace = preferences["output_transform"]
+    return colorspace
diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py
index 463324284b..a54256c59a 100644
--- a/openpype/hosts/maya/api/lib_renderproducts.py
+++ b/openpype/hosts/maya/api/lib_renderproducts.py
@@ -46,6 +46,7 @@ import attr
 
 from . import lib
 from . import lib_rendersetup
+from openpype.pipeline.colorspace import get_ocio_config_views
 
 from maya import cmds, mel
 
@@ -127,6 +128,7 @@ class RenderProduct(object):
     """
     productName = attr.ib()
     ext = attr.ib()                             # extension
+    colorspace = attr.ib()                      # colorspace
     aov = attr.ib(default=None)                 # source aov
     driver = attr.ib(default=None)              # source driver
     multipart = attr.ib(default=False)          # multichannel file
@@ -562,6 +564,9 @@ class RenderProductsArnold(ARenderProducts):
             ]
 
         for ai_driver in ai_drivers:
+            colorspace = self._get_colorspace(
+                ai_driver + ".colorManagement"
+            )
             # todo: check aiAOVDriver.prefix as it could have
             #       a custom path prefix set for this driver
 
@@ -599,12 +604,15 @@ class RenderProductsArnold(ARenderProducts):
             global_aov = self._get_attr(aov, "globalAov")
             if global_aov:
                 for camera in cameras:
-                    product = RenderProduct(productName=name,
-                                            ext=ext,
-                                            aov=aov_name,
-                                            driver=ai_driver,
-                                            multipart=self.multipart,
-                                            camera=camera)
+                    product = RenderProduct(
+                        productName=name,
+                        ext=ext,
+                        aov=aov_name,
+                        driver=ai_driver,
+                        multipart=self.multipart,
+                        camera=camera,
+                        colorspace=colorspace
+                    )
                     products.append(product)
 
             all_light_groups = self._get_attr(aov, "lightGroups")
@@ -612,13 +620,16 @@ class RenderProductsArnold(ARenderProducts):
                 # All light groups is enabled. A single multipart
                 # Render Product
                 for camera in cameras:
-                    product = RenderProduct(productName=name + "_lgroups",
-                                            ext=ext,
-                                            aov=aov_name,
-                                            driver=ai_driver,
-                                            # Always multichannel output
-                                            multipart=True,
-                                            camera=camera)
+                    product = RenderProduct(
+                        productName=name + "_lgroups",
+                        ext=ext,
+                        aov=aov_name,
+                        driver=ai_driver,
+                        # Always multichannel output
+                        multipart=True,
+                        camera=camera,
+                        colorspace=colorspace
+                    )
                     products.append(product)
             else:
                 value = self._get_attr(aov, "lightGroupsList")
@@ -634,12 +645,36 @@ class RenderProductsArnold(ARenderProducts):
                             aov=aov_name,
                             driver=ai_driver,
                             ext=ext,
-                            camera=camera
+                            camera=camera,
+                            colorspace=colorspace
                         )
                         products.append(product)
 
         return products
 
+    def _get_colorspace(self, attribute):
+        """Resolve colorspace from Arnold settings."""
+
+        def _view_transform():
+            preferences = lib.get_color_management_preferences()
+            views_data = get_ocio_config_views(preferences["config"])
+            view_data = views_data[
+                "{}/{}".format(preferences["display"], preferences["view"])
+            ]
+            return view_data["colorspace"]
+
+        def _raw():
+            preferences = lib.get_color_management_preferences()
+            return preferences["rendering_space"]
+
+        resolved_values = {
+            "Raw": _raw,
+            "Use View Transform": _view_transform,
+            # Default. Same as Maya Preferences.
+            "Use Output Transform": lib.get_color_management_output_transform
+        }
+        return resolved_values[self._get_attr(attribute)]()
+
     def get_render_products(self):
         """Get all AOVs.
 
@@ -668,11 +703,19 @@ class RenderProductsArnold(ARenderProducts):
         ]
 
         default_ext = self._get_attr("defaultRenderGlobals.imfPluginKey")
-        beauty_products = [RenderProduct(
-            productName="beauty",
-            ext=default_ext,
-            driver="defaultArnoldDriver",
-            camera=camera) for camera in cameras]
+        colorspace = self._get_colorspace(
+            "defaultArnoldDriver.colorManagement"
+        )
+        beauty_products = [
+            RenderProduct(
+                productName="beauty",
+                ext=default_ext,
+                driver="defaultArnoldDriver",
+                camera=camera,
+                colorspace=colorspace
+            ) for camera in cameras
+        ]
+
         # AOVs > Legacy > Maya Render View > Mode
         aovs_enabled = bool(
             self._get_attr("defaultArnoldRenderOptions.aovMode")
@@ -825,6 +868,7 @@ class RenderProductsVray(ARenderProducts):
                         productName="",
                         ext=default_ext,
                         camera=camera,
+                        colorspace=lib.get_color_management_output_transform(),
                         multipart=self.multipart
                     )
                 )
@@ -880,10 +924,13 @@ class RenderProductsVray(ARenderProducts):
 
             aov_name = self._get_vray_aov_name(aov)
             for camera in cameras:
-                product = RenderProduct(productName=aov_name,
-                                        ext=default_ext,
-                                        aov=aov,
-                                        camera=camera)
+                product = RenderProduct(
+                    productName=aov_name,
+                    ext=default_ext,
+                    aov=aov,
+                    camera=camera,
+                    colorspace=lib.get_color_management_output_transform()
+                )
                 products.append(product)
 
         return products
@@ -1367,7 +1414,12 @@ class RenderProductsMayaHardware(ARenderProducts):
 
         products = []
         for cam in self.get_renderable_cameras():
-            product = RenderProduct(productName="beauty", ext=ext, camera=cam)
+            product = RenderProduct(
+                productName="beauty",
+                ext=ext,
+                camera=cam,
+                colorspace=lib.get_color_management_output_transform()
+            )
             products.append(product)
 
         return products
diff --git a/openpype/hosts/maya/api/lib_rendersettings.py b/openpype/hosts/maya/api/lib_rendersettings.py
index 2a730100de..f19deb0351 100644
--- a/openpype/hosts/maya/api/lib_rendersettings.py
+++ b/openpype/hosts/maya/api/lib_rendersettings.py
@@ -23,7 +23,8 @@ class RenderSettings(object):
         'vray': 'vraySettings.fileNamePrefix',
         'arnold': 'defaultRenderGlobals.imageFilePrefix',
         'renderman': 'rmanGlobals.imageFileFormat',
-        'redshift': 'defaultRenderGlobals.imageFilePrefix'
+        'redshift': 'defaultRenderGlobals.imageFilePrefix',
+        'mayahardware2': 'defaultRenderGlobals.imageFilePrefix'
     }
 
     _image_prefixes = {
diff --git a/openpype/hosts/maya/plugins/create/create_animation.py b/openpype/hosts/maya/plugins/create/create_animation.py
index e54c12315c..a4b6e86598 100644
--- a/openpype/hosts/maya/plugins/create/create_animation.py
+++ b/openpype/hosts/maya/plugins/create/create_animation.py
@@ -13,6 +13,7 @@ class CreateAnimation(plugin.Creator):
     icon = "male"
     write_color_sets = False
     write_face_sets = False
+    include_user_defined_attributes = False
 
     def __init__(self, *args, **kwargs):
         super(CreateAnimation, self).__init__(*args, **kwargs)
@@ -47,3 +48,6 @@ class CreateAnimation(plugin.Creator):
 
         # Default to write normals.
         self.data["writeNormals"] = True
+
+        value = self.include_user_defined_attributes
+        self.data["includeUserDefinedAttributes"] = value
diff --git a/openpype/hosts/maya/plugins/create/create_pointcache.py b/openpype/hosts/maya/plugins/create/create_pointcache.py
index 63c0490dc7..1b8d5e6850 100644
--- a/openpype/hosts/maya/plugins/create/create_pointcache.py
+++ b/openpype/hosts/maya/plugins/create/create_pointcache.py
@@ -15,6 +15,7 @@ class CreatePointCache(plugin.Creator):
     icon = "gears"
     write_color_sets = False
     write_face_sets = False
+    include_user_defined_attributes = False
 
     def __init__(self, *args, **kwargs):
         super(CreatePointCache, self).__init__(*args, **kwargs)
@@ -33,6 +34,8 @@ class CreatePointCache(plugin.Creator):
         self.data["refresh"] = False       # Default to suspend refresh.
 
         # Add options for custom attributes
+        value = self.include_user_defined_attributes
+        self.data["includeUserDefinedAttributes"] = value
         self.data["attr"] = ""
         self.data["attrPrefix"] = ""
 
diff --git a/openpype/hosts/maya/plugins/publish/collect_animation.py b/openpype/hosts/maya/plugins/publish/collect_animation.py
index 549098863f..8f523f770b 100644
--- a/openpype/hosts/maya/plugins/publish/collect_animation.py
+++ b/openpype/hosts/maya/plugins/publish/collect_animation.py
@@ -46,7 +46,6 @@ class CollectAnimationOutputGeometry(pyblish.api.InstancePlugin):
 
         hierarchy = members + descendants
 
-
         # Ignore certain node types (e.g. constraints)
         ignore = cmds.ls(hierarchy, type=self.ignore_type, long=True)
         if ignore:
@@ -58,3 +57,18 @@ class CollectAnimationOutputGeometry(pyblish.api.InstancePlugin):
 
         if instance.data.get("farm"):
             instance.data["families"].append("publish.farm")
+
+        # Collect user defined attributes.
+        if not instance.data.get("includeUserDefinedAttributes", False):
+            return
+
+        user_defined_attributes = set()
+        for node in hierarchy:
+            attrs = cmds.listAttr(node, userDefined=True) or list()
+            shapes = cmds.listRelatives(node, shapes=True) or list()
+            for shape in shapes:
+                attrs.extend(cmds.listAttr(shape, userDefined=True) or list())
+
+            user_defined_attributes.update(attrs)
+
+        instance.data["userDefinedAttributes"] = list(user_defined_attributes)
diff --git a/openpype/hosts/maya/plugins/publish/collect_pointcache.py b/openpype/hosts/maya/plugins/publish/collect_pointcache.py
index 332992ca92..d0430c5612 100644
--- a/openpype/hosts/maya/plugins/publish/collect_pointcache.py
+++ b/openpype/hosts/maya/plugins/publish/collect_pointcache.py
@@ -42,3 +42,18 @@ class CollectPointcache(pyblish.api.InstancePlugin):
         if proxy_set:
             instance.remove(proxy_set)
             instance.data["setMembers"].remove(proxy_set)
+
+        # Collect user defined attributes.
+        if not instance.data.get("includeUserDefinedAttributes", False):
+            return
+
+        user_defined_attributes = set()
+        for node in instance:
+            attrs = cmds.listAttr(node, userDefined=True) or list()
+            shapes = cmds.listRelatives(node, shapes=True) or list()
+            for shape in shapes:
+                attrs.extend(cmds.listAttr(shape, userDefined=True) or list())
+
+            user_defined_attributes.update(attrs)
+
+        instance.data["userDefinedAttributes"] = list(user_defined_attributes)
diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py
index 338f148f85..7c47f17acb 100644
--- a/openpype/hosts/maya/plugins/publish/collect_render.py
+++ b/openpype/hosts/maya/plugins/publish/collect_render.py
@@ -269,7 +269,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
             self.log.info(full_exp_files)
             self.log.info("collecting layer: {}".format(layer_name))
             # Get layer specific settings, might be overrides
-
+            colorspace_data = lib.get_color_management_preferences()
             data = {
                 "subset": expected_layer_name,
                 "attachTo": attach_to,
@@ -323,6 +323,9 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
                 "renderSetupIncludeLights": render_instance.data.get(
                     "renderSetupIncludeLights"
                 ),
+                "colorspaceConfig": colorspace_data["config"],
+                "colorspaceDisplay": colorspace_data["display"],
+                "colorspaceView": colorspace_data["view"],
                 "strict_error_checking": render_instance.data.get(
                     "strict_error_checking", True
                 )
diff --git a/openpype/hosts/maya/plugins/publish/extract_pointcache.py b/openpype/hosts/maya/plugins/publish/extract_pointcache.py
index 0eb65e4226..a3b0560099 100644
--- a/openpype/hosts/maya/plugins/publish/extract_pointcache.py
+++ b/openpype/hosts/maya/plugins/publish/extract_pointcache.py
@@ -1,5 +1,4 @@
 import os
-import copy
 
 from maya import cmds
 
@@ -10,7 +9,6 @@ from openpype.hosts.maya.api.lib import (
     maintained_selection,
     iter_visible_nodes_in_range
 )
-from openpype.lib import StringTemplate
 
 
 class ExtractAlembic(publish.Extractor):
@@ -41,6 +39,7 @@ class ExtractAlembic(publish.Extractor):
 
         attrs = instance.data.get("attr", "").split(";")
         attrs = [value for value in attrs if value.strip()]
+        attrs += instance.data.get("userDefinedAttributes", [])
         attrs += ["cbId"]
 
         attr_prefixes = instance.data.get("attrPrefix", "").split(";")
@@ -115,6 +114,7 @@ class ExtractAlembic(publish.Extractor):
 
         # Extract proxy.
         if not instance.data.get("proxy"):
+            self.log.info("No proxy nodes found. Skipping proxy extraction.")
             return
 
         path = path.replace(".abc", "_proxy.abc")
@@ -134,26 +134,14 @@ class ExtractAlembic(publish.Extractor):
                     **options
                 )
 
-        template_data = copy.deepcopy(instance.data["anatomyData"])
-        template_data.update({"ext": "abc"})
-        templates = instance.context.data["anatomy"].templates["publish"]
-        published_filename_without_extension = StringTemplate(
-            templates["file"]
-        ).format(template_data).replace(".abc", "_proxy")
-        transfers = []
-        destination = os.path.join(
-            instance.data["resourcesDir"],
-            filename.replace(
-                filename.split(".")[0],
-                published_filename_without_extension
-            )
-        )
-        transfers.append((path, destination))
-
-        for source, destination in transfers:
-            self.log.debug("Transfer: {} > {}".format(source, destination))
-
-        instance.data["transfers"] = transfers
+        representation = {
+            "name": "proxy",
+            "ext": "abc",
+            "files": os.path.basename(path),
+            "stagingDir": dirname,
+            "outputName": "proxy"
+        }
+        instance.data["representations"].append(representation)
 
     def get_members_and_roots(self, instance):
         return instance[:], instance.data.get("setMembers")
diff --git a/openpype/hosts/maya/startup/userSetup.py b/openpype/hosts/maya/startup/userSetup.py
index bfa5e6e60d..c77ecb829e 100644
--- a/openpype/hosts/maya/startup/userSetup.py
+++ b/openpype/hosts/maya/startup/userSetup.py
@@ -7,12 +7,13 @@ from openpype.hosts.maya.api import MayaHost
 
 from maya import cmds
 
+
 host = MayaHost()
 install_host(host)
 
-
 print("Starting OpenPype usersetup...")
 
+
 # Open Workfile Post Initialization.
 key = "OPENPYPE_OPEN_WORKFILE_POST_INITIALIZATION"
 if bool(int(os.environ.get(key, "0"))):
diff --git a/openpype/hosts/tvpaint/api/lib.py b/openpype/hosts/tvpaint/api/lib.py
index 312a211d49..49846d7f29 100644
--- a/openpype/hosts/tvpaint/api/lib.py
+++ b/openpype/hosts/tvpaint/api/lib.py
@@ -43,14 +43,15 @@ def parse_layers_data(data):
             layer_id, group_id, visible, position, opacity, name,
             layer_type,
             frame_start, frame_end, prelighttable, postlighttable,
-            selected, editable, sencil_state
+            selected, editable, sencil_state, is_current
         ) = layer_raw.split("|")
         layer = {
             "layer_id": int(layer_id),
             "group_id": int(group_id),
             "visible": visible == "ON",
             "position": int(position),
-            "opacity": int(opacity),
+            # Opacity from 'tv_layerinfo' is always set to '0' so it's unusable
+            # "opacity": int(opacity),
             "name": name,
             "type": layer_type,
             "frame_start": int(frame_start),
@@ -59,7 +60,8 @@ def parse_layers_data(data):
             "postlighttable": postlighttable == "1",
             "selected": selected == "1",
             "editable": editable == "1",
-            "sencil_state": sencil_state
+            "sencil_state": sencil_state,
+            "is_current": is_current == "1"
         }
         layers.append(layer)
     return layers
@@ -87,15 +89,17 @@ def get_layers_data_george_script(output_filepath, layer_ids=None):
             " selected editable sencilState"
         ),
         # Check if layer ID match `tv_LayerCurrentID`
+        "is_current=0",
         "IF CMP(current_layer_id, layer_id)==1",
         # - mark layer as selected if layer id match to current layer id
+        "is_current=1",
         "selected=1",
         "END",
         # Prepare line with data separated by "|"
         (
             "line = layer_id'|'group_id'|'visible'|'position'|'opacity'|'"
             "name'|'type'|'startFrame'|'endFrame'|'prelighttable'|'"
-            "postlighttable'|'selected'|'editable'|'sencilState"
+            "postlighttable'|'selected'|'editable'|'sencilState'|'is_current"
         ),
         # Write data to output file
         "tv_writetextfile \"strict\" \"append\" '\"'output_path'\"' line",
diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py
index 7e85977b11..9711024c79 100644
--- a/openpype/hosts/tvpaint/plugins/create/create_render.py
+++ b/openpype/hosts/tvpaint/plugins/create/create_render.py
@@ -41,6 +41,7 @@ from openpype.client import get_asset_by_name
 from openpype.lib import (
     prepare_template_data,
     AbstractAttrDef,
+    UILabelDef,
     UISeparatorDef,
     EnumDef,
     TextDef,
@@ -66,7 +67,7 @@ RENDER_LAYER_DETAILED_DESCRIPTIONS = (
 Be aware Render Layer <b>is not</b> TVPaint layer.
 
 All TVPaint layers in the scene with the color group id are rendered in the
-beauty pass. To create sub passes use Render Layer creator which is
+beauty pass. To create sub passes use Render Pass creator which is
 dependent on existence of render layer instance.
 
 The group can represent an asset (tree) or different part of scene that consist
@@ -82,8 +83,8 @@ could be Render Layer which has 'Arm', 'Head' and 'Body' as Render Passes.
 RENDER_PASS_DETAILED_DESCRIPTIONS = (
     """Render Pass is sub part of Render Layer.
 
-Render Pass can consist of one or more TVPaint layers. Render Layers must
-belong to a Render Layer. Marker TVPaint layers will change it's group color
+Render Pass can consist of one or more TVPaint layers. Render Pass must
+belong to a Render Layer. Marked TVPaint layers will change it's group color
 to match group color of Render Layer.
 """
 )
@@ -461,7 +462,10 @@ class CreateRenderPass(TVPaintCreator):
             "render_layer_instance_id"
         )
         if not render_layer_instance_id:
-            raise CreatorError("Missing RenderLayer instance")
+            raise CreatorError((
+                "You cannot create a Render Pass without a Render Layer."
+                " Please select one first"
+            ))
 
         render_layer_instance = self.create_context.instances_by_id.get(
             render_layer_instance_id
@@ -598,12 +602,45 @@ class CreateRenderPass(TVPaintCreator):
         ]
 
     def get_pre_create_attr_defs(self):
+        # Find available Render Layers
+        # - instances are created after creators reset
+        current_instances = self.host.list_instances()
+        render_layers = [
+            {
+                "value": instance["instance_id"],
+                "label": instance["subset"]
+            }
+            for instance in current_instances
+            if instance["creator_identifier"] == CreateRenderlayer.identifier
+        ]
+        if not render_layers:
+            render_layers.append({"value": None, "label": "N/A"})
+
+        return [
+            EnumDef(
+                "render_layer_instance_id",
+                label="Render Layer",
+                items=render_layers
+            ),
+            UILabelDef(
+                "NOTE: Try to hit refresh if you don't see a Render Layer"
+            ),
+            BoolDef(
+                "mark_for_review",
+                label="Review",
+                default=self.mark_for_review
+            )
+        ]
+
+    def get_instance_attr_defs(self):
+        # Find available Render Layers
+        current_instances = self.create_context.instances
         render_layers = [
             {
                 "value": instance.id,
                 "label": instance.label
             }
-            for instance in self.create_context.instances
+            for instance in current_instances
             if instance.creator_identifier == CreateRenderlayer.identifier
         ]
         if not render_layers:
@@ -615,6 +652,9 @@ class CreateRenderPass(TVPaintCreator):
                 label="Render Layer",
                 items=render_layers
             ),
+            UILabelDef(
+                "NOTE: Try to hit refresh if you don't see a Render Layer"
+            ),
             BoolDef(
                 "mark_for_review",
                 label="Review",
@@ -622,9 +662,6 @@ class CreateRenderPass(TVPaintCreator):
             )
         ]
 
-    def get_instance_attr_defs(self):
-        return self.get_pre_create_attr_defs()
-
 
 class TVPaintAutoDetectRenderCreator(TVPaintCreator):
     """Create Render Layer and Render Pass instances based on scene data.
diff --git a/openpype/hosts/unreal/addon.py b/openpype/hosts/unreal/addon.py
index e2c8484651..24e2db975d 100644
--- a/openpype/hosts/unreal/addon.py
+++ b/openpype/hosts/unreal/addon.py
@@ -17,9 +17,10 @@ class UnrealAddon(OpenPypeModule, IHostAddon):
 
         ue_plugin = "UE_5.0" if app.name[:1] == "5" else "UE_4.7"
         unreal_plugin_path = os.path.join(
-            UNREAL_ROOT_DIR, "integration", ue_plugin
+            UNREAL_ROOT_DIR, "integration", ue_plugin, "OpenPype"
         )
-        if not env.get("OPENPYPE_UNREAL_PLUGIN"):
+        if not env.get("OPENPYPE_UNREAL_PLUGIN") or \
+                env.get("OPENPYPE_UNREAL_PLUGIN") != unreal_plugin_path:
             env["OPENPYPE_UNREAL_PLUGIN"] = unreal_plugin_path
 
         # Set default environments if are not set via settings
diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py
index 2dc6fb9f42..4c9f8258f5 100644
--- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py
+++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py
@@ -79,9 +79,9 @@ class UnrealPrelaunchHook(PreLaunchHook):
         unreal_project_name = os.path.splitext(unreal_project_filename)[0]
         # Unreal is sensitive about project names longer then 20 chars
         if len(unreal_project_name) > 20:
-            self.log.warning((
-                f"Project name exceed 20 characters ({unreal_project_name})!"
-            ))
+            raise ApplicationLaunchFailed(
+                f"Project name exceeds 20 characters ({unreal_project_name})!"
+            )
 
         # Unreal doesn't accept non alphabet characters at the start
         # of the project name. This is because project name is then used
@@ -119,29 +119,34 @@ class UnrealPrelaunchHook(PreLaunchHook):
                 f"detected [ {engine_version} ]"
             ))
 
-        ue_path = unreal_lib.get_editor_executable_path(
+        ue_path = unreal_lib.get_editor_exe_path(
             Path(detected[engine_version]), engine_version)
 
         self.launch_context.launch_args = [ue_path.as_posix()]
         project_path.mkdir(parents=True, exist_ok=True)
 
+        # Set "OPENPYPE_UNREAL_PLUGIN" to current process environment for
+        # execution of `create_unreal_project`
+
+        if self.launch_context.env.get("OPENPYPE_UNREAL_PLUGIN"):
+            self.log.info((
+                f"{self.signature} using OpenPype plugin from "
+                f"{self.launch_context.env.get('OPENPYPE_UNREAL_PLUGIN')}"
+            ))
+        env_key = "OPENPYPE_UNREAL_PLUGIN"
+        if self.launch_context.env.get(env_key):
+            os.environ[env_key] = self.launch_context.env[env_key]
+
+        engine_path = detected[engine_version]
+
+        unreal_lib.try_installing_plugin(Path(engine_path), os.environ)
+
         project_file = project_path / unreal_project_filename
         if not project_file.is_file():
-            engine_path = detected[engine_version]
             self.log.info((
                 f"{self.signature} creating unreal "
                 f"project [ {unreal_project_name} ]"
             ))
-            # Set "OPENPYPE_UNREAL_PLUGIN" to current process environment for
-            # execution of `create_unreal_project`
-            if self.launch_context.env.get("OPENPYPE_UNREAL_PLUGIN"):
-                self.log.info((
-                    f"{self.signature} using OpenPype plugin from "
-                    f"{self.launch_context.env.get('OPENPYPE_UNREAL_PLUGIN')}"
-                ))
-            env_key = "OPENPYPE_UNREAL_PLUGIN"
-            if self.launch_context.env.get(env_key):
-                os.environ[env_key] = self.launch_context.env[env_key]
 
             unreal_lib.create_unreal_project(
                 unreal_project_name,
diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore
new file mode 100644
index 0000000000..e74e6886b7
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/.gitignore
@@ -0,0 +1,8 @@
+/Saved
+/DerivedDataCache
+/Intermediate
+/Content
+/Config
+/Binaries
+/.idea
+/.vs
\ No newline at end of file
diff --git a/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject
new file mode 100644
index 0000000000..4d75e03bf3
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/CommandletProject/CommandletProject.uproject
@@ -0,0 +1,12 @@
+{
+	"FileVersion": 3,
+	"EngineAssociation": "4.27",
+	"Category": "",
+	"Description": "",
+	"Plugins": [
+		{
+			"Name": "OpenPype",
+			"Enabled": true
+		}
+	]
+}
\ No newline at end of file
diff --git a/openpype/hosts/unreal/integration/UE_4.7/.gitignore b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_4.7/.gitignore
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/.gitignore
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Config/DefaultOpenPypeSettings.ini b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/DefaultOpenPypeSettings.ini
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_4.7/Config/DefaultOpenPypeSettings.ini
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/DefaultOpenPypeSettings.ini
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/FilterPlugin.ini b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/FilterPlugin.ini
new file mode 100644
index 0000000000..ccebca2f32
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Config/FilterPlugin.ini
@@ -0,0 +1,8 @@
+[FilterPlugin]
+; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
+; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
+;
+; Examples:
+;    /README.txt
+;    /Extras/...
+;    /Binaries/ThirdParty/*.dll
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Content/Python/init_unreal.py b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Content/Python/init_unreal.py
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_4.7/Content/Python/init_unreal.py
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Content/Python/init_unreal.py
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype.uplugin b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin
similarity index 86%
rename from openpype/hosts/unreal/integration/UE_5.0/OpenPype.uplugin
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin
index 4c7a74403c..b2cbe3cff3 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/OpenPype.uplugin
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/OpenPype.uplugin
@@ -10,10 +10,9 @@
 	"DocsURL": "https://openpype.io/docs/artist_hosts_unreal",
 	"MarketplaceURL": "",
 	"SupportURL": "https://pype.club/",
+	"EngineVersion": "4.27",
 	"CanContainContent": true,
-	"IsBetaVersion": true,
-	"IsExperimentalVersion": false,
-	"Installed": false,
+	"Installed": true,
 	"Modules": [
 		{
 			"Name": "OpenPype",
diff --git a/openpype/hosts/unreal/integration/UE_4.7/README.md b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/README.md
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_4.7/README.md
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/README.md
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Resources/openpype128.png b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype128.png
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_4.7/Resources/openpype128.png
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype128.png
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Resources/openpype40.png b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype40.png
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_4.7/Resources/openpype40.png
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype40.png
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Resources/openpype512.png b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype512.png
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_4.7/Resources/openpype512.png
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Resources/openpype512.png
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/OpenPype.Build.cs b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs
similarity index 88%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/OpenPype.Build.cs
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs
index 46e5dcb2df..f77c1383eb 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/OpenPype.Build.cs
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/OpenPype.Build.cs
@@ -1,4 +1,4 @@
-// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+// Copyright 2023, Ayon, All rights reserved.
 
 using UnrealBuildTool;
 
@@ -6,8 +6,8 @@ public class OpenPype : ModuleRules
 {
 	public OpenPype(ReadOnlyTargetRules Target) : base(Target)
 	{
-		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
-		
+		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+
 		PublicIncludePaths.AddRange(
 			new string[] {
 				// ... add public include paths required here ...
@@ -34,6 +34,7 @@ public class OpenPype : ModuleRules
 		PrivateDependencyModuleNames.AddRange(
 			new string[]
 			{
+				"GameProjectGeneration",
 				"Projects",
 				"InputCore",
 				"UnrealEd",
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp
new file mode 100644
index 0000000000..abb1975027
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp
@@ -0,0 +1,141 @@
+// Copyright 2023, Ayon, All rights reserved.
+#include "Commandlets/Implementations/OPGenerateProjectCommandlet.h"
+
+#include "Editor.h"
+#include "GameProjectUtils.h"
+#include "OPConstants.h"
+#include "Commandlets/OPActionResult.h"
+#include "ProjectDescriptor.h"
+
+int32 UOPGenerateProjectCommandlet::Main(const FString& CommandLineParams)
+{
+	//Parses command line parameters & creates structure FProjectInformation
+	const FOPGenerateProjectParams ParsedParams = FOPGenerateProjectParams(CommandLineParams);
+	ProjectInformation = ParsedParams.GenerateUEProjectInformation();
+
+	//Creates .uproject & other UE files
+	EVALUATE_OP_ACTION_RESULT(TryCreateProject());
+
+	//Loads created .uproject
+	EVALUATE_OP_ACTION_RESULT(TryLoadProjectDescriptor());
+
+	//Adds needed plugin to .uproject
+	AttachPluginsToProjectDescriptor();
+
+	//Saves .uproject
+	EVALUATE_OP_ACTION_RESULT(TrySave());
+
+	//When we are here, there should not be problems in generating Unreal Project for OpenPype
+	return 0;
+}
+
+
+FOPGenerateProjectParams::FOPGenerateProjectParams(): FOPGenerateProjectParams("")
+{
+}
+
+FOPGenerateProjectParams::FOPGenerateProjectParams(const FString& CommandLineParams): CommandLineParams(
+	CommandLineParams)
+{
+	UCommandlet::ParseCommandLine(*CommandLineParams, Tokens, Switches);
+}
+
+FProjectInformation FOPGenerateProjectParams::GenerateUEProjectInformation() const
+{
+	FProjectInformation ProjectInformation = FProjectInformation();
+	ProjectInformation.ProjectFilename = GetProjectFileName();
+
+	ProjectInformation.bShouldGenerateCode = IsSwitchPresent("GenerateCode");
+
+	return ProjectInformation;
+}
+
+FString FOPGenerateProjectParams::TryGetToken(const int32 Index) const
+{
+	return Tokens.IsValidIndex(Index) ? Tokens[Index] : "";
+}
+
+FString FOPGenerateProjectParams::GetProjectFileName() const
+{
+	return TryGetToken(0);
+}
+
+bool FOPGenerateProjectParams::IsSwitchPresent(const FString& Switch) const
+{
+	return INDEX_NONE != Switches.IndexOfByPredicate([&Switch](const FString& Item) -> bool
+		{
+			return Item.Equals(Switch);
+		}
+	);
+}
+
+
+UOPGenerateProjectCommandlet::UOPGenerateProjectCommandlet()
+{
+	LogToConsole = true;
+}
+
+FOP_ActionResult UOPGenerateProjectCommandlet::TryCreateProject() const
+{
+	FText FailReason;
+	FText FailLog;
+	TArray<FString> OutCreatedFiles;
+
+	if (!GameProjectUtils::CreateProject(ProjectInformation, FailReason, FailLog, &OutCreatedFiles))
+		return FOP_ActionResult(EOP_ActionResult::ProjectNotCreated, FailReason);
+	return FOP_ActionResult();
+}
+
+FOP_ActionResult UOPGenerateProjectCommandlet::TryLoadProjectDescriptor()
+{
+	FText FailReason;
+	const bool bLoaded = ProjectDescriptor.Load(ProjectInformation.ProjectFilename, FailReason);
+
+	return FOP_ActionResult(bLoaded ? EOP_ActionResult::Ok : EOP_ActionResult::ProjectNotLoaded, FailReason);
+}
+
+void UOPGenerateProjectCommandlet::AttachPluginsToProjectDescriptor()
+{
+	FPluginReferenceDescriptor OPPluginDescriptor;
+	OPPluginDescriptor.bEnabled = true;
+	OPPluginDescriptor.Name = OPConstants::OP_PluginName;
+	ProjectDescriptor.Plugins.Add(OPPluginDescriptor);
+
+	FPluginReferenceDescriptor PythonPluginDescriptor;
+	PythonPluginDescriptor.bEnabled = true;
+	PythonPluginDescriptor.Name = OPConstants::PythonScript_PluginName;
+	ProjectDescriptor.Plugins.Add(PythonPluginDescriptor);
+
+	FPluginReferenceDescriptor SequencerScriptingPluginDescriptor;
+	SequencerScriptingPluginDescriptor.bEnabled = true;
+	SequencerScriptingPluginDescriptor.Name = OPConstants::SequencerScripting_PluginName;
+	ProjectDescriptor.Plugins.Add(SequencerScriptingPluginDescriptor);
+
+	FPluginReferenceDescriptor MovieRenderPipelinePluginDescriptor;
+	MovieRenderPipelinePluginDescriptor.bEnabled = true;
+	MovieRenderPipelinePluginDescriptor.Name = OPConstants::MovieRenderPipeline_PluginName;
+	ProjectDescriptor.Plugins.Add(MovieRenderPipelinePluginDescriptor);
+
+	FPluginReferenceDescriptor EditorScriptingPluginDescriptor;
+	EditorScriptingPluginDescriptor.bEnabled = true;
+	EditorScriptingPluginDescriptor.Name = OPConstants::EditorScriptingUtils_PluginName;
+	ProjectDescriptor.Plugins.Add(EditorScriptingPluginDescriptor);
+}
+
+FOP_ActionResult UOPGenerateProjectCommandlet::TrySave()
+{
+	FText FailReason;
+	const bool bSaved = ProjectDescriptor.Save(ProjectInformation.ProjectFilename, FailReason);
+
+	return FOP_ActionResult(bSaved ? EOP_ActionResult::Ok : EOP_ActionResult::ProjectNotSaved, FailReason);
+}
+
+FOPGenerateProjectParams UOPGenerateProjectCommandlet::ParseParameters(const FString& Params) const
+{
+	FOPGenerateProjectParams ParamsResult;
+
+	TArray<FString> Tokens, Switches;
+	ParseCommandLine(*Params, Tokens, Switches);
+
+	return ParamsResult;
+}
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp
new file mode 100644
index 0000000000..6e50ef2221
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp
@@ -0,0 +1,41 @@
+// Copyright 2023, Ayon, All rights reserved.
+
+
+#include "Commandlets/OPActionResult.h"
+#include "Logging/OP_Log.h"
+
+EOP_ActionResult::Type& FOP_ActionResult::GetStatus()
+{
+	return Status;
+}
+
+FText& FOP_ActionResult::GetReason()
+{
+	return Reason;
+}
+
+FOP_ActionResult::FOP_ActionResult():Status(EOP_ActionResult::Type::Ok)
+{
+	
+}
+
+FOP_ActionResult::FOP_ActionResult(const EOP_ActionResult::Type& InEnum):Status(InEnum)
+{
+	TryLog();
+}
+
+FOP_ActionResult::FOP_ActionResult(const EOP_ActionResult::Type& InEnum, const FText& InReason):Status(InEnum), Reason(InReason)
+{
+	TryLog();
+};
+
+bool FOP_ActionResult::IsProblem() const
+{
+	return Status != EOP_ActionResult::Ok;
+}
+
+void FOP_ActionResult::TryLog() const
+{
+	if(IsProblem())		
+		UE_LOG(LogCommandletOPGenerateProject, Error, TEXT("%s"), *Reason.ToString());		
+}
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp
new file mode 100644
index 0000000000..29b1068c21
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp
@@ -0,0 +1 @@
+#include "Logging/OP_Log.h"
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPype.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp
similarity index 78%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPype.cpp
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp
index d06a08eb43..9bf7b341c5 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPype.cpp
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPype.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPype.h"
 
 #include "ISettingsContainer.h"
@@ -16,32 +17,34 @@ static const FName OpenPypeTabName("OpenPype");
 // This function is triggered when the plugin is staring up
 void FOpenPypeModule::StartupModule()
 {
-	FOpenPypeStyle::Initialize();
-	FOpenPypeStyle::SetIcon("Logo", "openpype40");
+	if (!IsRunningCommandlet()) {
+		FOpenPypeStyle::Initialize();
+		FOpenPypeStyle::SetIcon("Logo", "openpype40");
 
-	// Create the Extender that will add content to the menu
-	FLevelEditorModule& LevelEditorModule = FModuleManager::LoadModuleChecked<FLevelEditorModule>("LevelEditor");
+		// Create the Extender that will add content to the menu
+		FLevelEditorModule& LevelEditorModule = FModuleManager::LoadModuleChecked<FLevelEditorModule>("LevelEditor");
 
-	TSharedPtr<FExtender> MenuExtender = MakeShareable(new FExtender());
-	TSharedPtr<FExtender> ToolbarExtender = MakeShareable(new FExtender());
+		TSharedPtr<FExtender> MenuExtender = MakeShareable(new FExtender());
+		TSharedPtr<FExtender> ToolbarExtender = MakeShareable(new FExtender());
 
-	MenuExtender->AddMenuExtension(
-		"LevelEditor",
-		EExtensionHook::After,
-		NULL,
-		FMenuExtensionDelegate::CreateRaw(this, &FOpenPypeModule::AddMenuEntry)
-	);
-	ToolbarExtender->AddToolBarExtension(
-		"Settings",
-		EExtensionHook::After,
-		NULL,
-		FToolBarExtensionDelegate::CreateRaw(this, &FOpenPypeModule::AddToobarEntry));
+		MenuExtender->AddMenuExtension(
+			"LevelEditor",
+			EExtensionHook::After,
+			NULL,
+			FMenuExtensionDelegate::CreateRaw(this, &FOpenPypeModule::AddMenuEntry)
+		);
+		ToolbarExtender->AddToolBarExtension(
+			"Settings",
+			EExtensionHook::After,
+			NULL,
+			FToolBarExtensionDelegate::CreateRaw(this, &FOpenPypeModule::AddToobarEntry));
 
 
-	LevelEditorModule.GetMenuExtensibilityManager()->AddExtender(MenuExtender);
-	LevelEditorModule.GetToolBarExtensibilityManager()->AddExtender(ToolbarExtender);
+		LevelEditorModule.GetMenuExtensibilityManager()->AddExtender(MenuExtender);
+		LevelEditorModule.GetToolBarExtensibilityManager()->AddExtender(ToolbarExtender);
 
-	RegisterSettings();
+		RegisterSettings();
+	}
 }
 
 void FOpenPypeModule::ShutdownModule()
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeLib.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp
similarity index 96%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeLib.cpp
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp
index a58e921288..008025e816 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeLib.cpp
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPypeLib.h"
 
 #include "AssetViewUtils.h"
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstance.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp
similarity index 97%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstance.cpp
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp
index 38740f1cbd..05638fbd0b 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstance.cpp
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp
@@ -1,11 +1,12 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 
 #include "OpenPypePublishInstance.h"
 #include "AssetRegistryModule.h"
-#include "NotificationManager.h"
 #include "OpenPypeLib.h"
 #include "OpenPypeSettings.h"
-#include "SNotificationList.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
 
 //Moves all the invalid pointers to the end to prepare them for the shrinking
 #define REMOVE_INVALID_ENTRIES(VAR) VAR.CompactStable(); \
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
similarity index 94%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
index 9b26da7fa4..a32ebe32cb 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPypePublishInstanceFactory.h"
 #include "OpenPypePublishInstance.h"
 
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePythonBridge.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp
similarity index 90%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePythonBridge.cpp
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp
index 8113231503..6ebfc528f0 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePythonBridge.cpp
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPypePythonBridge.h"
 
 UOpenPypePythonBridge* UOpenPypePythonBridge::Get()
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeSettings.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp
similarity index 79%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeSettings.cpp
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp
index 7134614d22..dd4228dfd0 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeSettings.cpp
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp
@@ -1,9 +1,8 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2023, Ayon, All rights reserved.
 
 #include "OpenPypeSettings.h"
 
-#include "IPluginManager.h"
-#include "UObjectGlobals.h"
+#include "Interfaces/IPluginManager.h"
 
 /**
  * Mainly is used for initializing default values if the DefaultOpenPypeSettings.ini file does not exist in the saved config
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeStyle.cpp b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp
similarity index 92%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeStyle.cpp
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp
index a51c2d6aa5..0cc854c5ef 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypeStyle.cpp
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPypeStyle.h"
 #include "Framework/Application/SlateApplication.h"
 #include "Styling/SlateStyle.h"
@@ -43,7 +44,7 @@ const FVector2D Icon40x40(40.0f, 40.0f);
 TUniquePtr< FSlateStyleSet > FOpenPypeStyle::Create()
 {
 	TUniquePtr< FSlateStyleSet > Style = MakeUnique<FSlateStyleSet>(GetStyleSetName());
-	Style->SetContentRoot(FPaths::ProjectPluginsDir() / TEXT("OpenPype/Resources"));
+	Style->SetContentRoot(FPaths::EnginePluginsDir() / TEXT("Marketplace/OpenPype/Resources"));
 
 	return Style;
 }
@@ -66,5 +67,4 @@ const ISlateStyle& FOpenPypeStyle::Get()
 {
 	check(OpenPypeStyleInstance);
 	return *OpenPypeStyleInstance;
-	return *OpenPypeStyleInstance;
 }
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h
new file mode 100644
index 0000000000..d1129aa070
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h
@@ -0,0 +1,60 @@
+// Copyright 2023, Ayon, All rights reserved.
+#pragma once
+
+#include "GameProjectUtils.h"
+#include "Commandlets/OPActionResult.h"
+#include "ProjectDescriptor.h"
+#include "Commandlets/Commandlet.h"
+#include "OPGenerateProjectCommandlet.generated.h"
+
+struct FProjectDescriptor;
+struct FProjectInformation;
+
+/**
+* @brief Structure which parses command line parameters and generates FProjectInformation
+*/
+USTRUCT()
+struct FOPGenerateProjectParams
+{
+	GENERATED_BODY()
+
+private:
+	FString CommandLineParams;
+	TArray<FString> Tokens;
+	TArray<FString> Switches;
+
+public:
+	FOPGenerateProjectParams();
+	FOPGenerateProjectParams(const FString& CommandLineParams);
+
+	FProjectInformation GenerateUEProjectInformation() const;
+
+private:
+	FString TryGetToken(const int32 Index) const;
+	FString GetProjectFileName() const;
+
+	bool IsSwitchPresent(const FString& Switch) const;
+};
+ 
+UCLASS()
+class OPENPYPE_API UOPGenerateProjectCommandlet : public UCommandlet
+{
+	GENERATED_BODY()
+
+private:
+	FProjectInformation ProjectInformation;
+	FProjectDescriptor ProjectDescriptor;
+
+public:
+	UOPGenerateProjectCommandlet();
+	
+	virtual int32 Main(const FString& CommandLineParams) override;
+
+private:
+	FOPGenerateProjectParams ParseParameters(const FString& Params) const;
+	FOP_ActionResult TryCreateProject() const;
+	FOP_ActionResult TryLoadProjectDescriptor();
+	void AttachPluginsToProjectDescriptor();
+	FOP_ActionResult TrySave();
+};
+
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h
new file mode 100644
index 0000000000..c960bbf190
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h
@@ -0,0 +1,83 @@
+// Copyright 2023, Ayon, All rights reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "OPActionResult.generated.h"
+
+/**
+ * @brief This macro returns error code when is problem or does nothing when there is no problem.
+ * @param ActionResult FOP_ActionResult structure
+ */
+#define EVALUATE_OP_ACTION_RESULT(ActionResult) \
+	if(ActionResult.IsProblem()) \
+		return ActionResult.GetStatus();
+
+/**
+* @brief This enum values are humanly readable mapping of error codes.
+* Here should be all error codes to be possible find what went wrong.
+* TODO: In the future should exists an web document where is mapped error code & what problem occured & how to repair it...
+*/
+UENUM()
+namespace EOP_ActionResult
+{
+	enum Type
+	{
+		Ok,
+		ProjectNotCreated,
+		ProjectNotLoaded,
+		ProjectNotSaved,
+		//....Here insert another values 
+
+		//Do not remove!
+		//Usable for looping through enum values
+		__Last UMETA(Hidden) 
+	};
+}
+
+
+/**
+ * @brief This struct holds action result enum and optionally reason of fail
+ */
+USTRUCT()
+struct FOP_ActionResult
+{
+	GENERATED_BODY()
+
+public:
+	/**	 @brief Default constructor usable when there is no problem */
+	FOP_ActionResult();
+
+	/**
+	 * @brief This constructor initializes variables & attempts to log when is error
+	 * @param InEnum Status
+	 */
+	FOP_ActionResult(const EOP_ActionResult::Type& InEnum);
+
+	/**
+	 * @brief This constructor initializes variables & attempts to log when is error
+	 * @param InEnum Status
+	 * @param InReason Reason of potential fail
+	 */
+	FOP_ActionResult(const EOP_ActionResult::Type& InEnum, const FText& InReason);
+
+private:
+	/** @brief Action status  */
+	EOP_ActionResult::Type Status;	
+
+	/** @brief Optional reason of fail	 */
+	FText Reason;	
+
+public:
+	/**
+	 * @brief Checks if there is problematic state
+	 * @return true when status is not equal to EOP_ActionResult::Ok
+	 */
+	bool IsProblem() const;
+	EOP_ActionResult::Type& GetStatus();
+	FText& GetReason();
+
+private:	
+	void TryLog() const;
+};
+
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h
new file mode 100644
index 0000000000..3740c5285a
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h
@@ -0,0 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
+#pragma once
+
+DEFINE_LOG_CATEGORY_STATIC(LogCommandletOPGenerateProject, Log, All);
\ No newline at end of file
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h
new file mode 100644
index 0000000000..f4587f7a50
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OPConstants.h
@@ -0,0 +1,13 @@
+// Copyright 2023, Ayon, All rights reserved.
+#pragma once
+
+namespace OPConstants 
+{
+	const FString OP_PluginName = "OpenPype";
+	const FString PythonScript_PluginName = "PythonScriptPlugin";
+	const FString SequencerScripting_PluginName = "SequencerScripting";
+	const FString MovieRenderPipeline_PluginName = "MovieRenderPipeline";
+	const FString EditorScriptingUtils_PluginName = "EditorScriptingUtilities";
+}
+
+
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPype.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h
similarity index 86%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPype.h
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h
index 9cfa60176c..2454344128 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPype.h
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPype.h
@@ -1,4 +1,4 @@
-// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+// Copyright 2023, Ayon, All rights reserved.
 
 #pragma once
 
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeLib.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h
similarity index 90%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeLib.h
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h
index 06425c7c7d..ef4d1027ea 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeLib.h
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeLib.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 
 #include "Engine.h"
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstance.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h
similarity index 92%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstance.h
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h
index cd414fe2cc..8cfcd067c0 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstance.h
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 
 #include "Engine.h"
@@ -16,7 +17,7 @@ public:
 	 *
 	 *	@return - Set of UObjects. Careful! They are returning raw pointers. Seems like an issue in UE5
 	 */
-	UFUNCTION(BlueprintCallable, BlueprintPure)
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python")
 	TSet<UObject*> GetInternalAssets() const
 	{
 		//For some reason it can only return Raw Pointers? Seems like an issue which they haven't fixed.
@@ -33,7 +34,7 @@ public:
 	 *
 	 *	@return - TSet of assets (UObjects). Careful! They are returning raw pointers. Seems like an issue in UE5
 	 */
-	UFUNCTION(BlueprintCallable, BlueprintPure)
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python")
 	TSet<UObject*> GetExternalAssets() const
 	{
 		//For some reason it can only return Raw Pointers? Seems like an issue which they haven't fixed.
@@ -53,7 +54,7 @@ public:
 	 *
 	 * @attention If the bAddExternalAssets variable is false, external assets won't be included!
 	 */
-	UFUNCTION(BlueprintCallable, BlueprintPure)
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python")
 	TSet<UObject*> GetAllAssets() const
 	{
 		const TSet<TSoftObjectPtr<UObject>>& IteratedSet = bAddExternalAssets
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
similarity index 92%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
index 7d2c77fe6e..3fdb984411 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 
 #include "CoreMinimal.h"
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePythonBridge.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h
similarity index 90%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePythonBridge.h
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h
index 692aab2e5e..827f76f56b 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePythonBridge.h
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 #include "Engine.h"
 #include "OpenPypePythonBridge.generated.h"
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeSettings.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h
similarity index 88%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeSettings.h
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h
index 2df6c887cf..88defaa773 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeSettings.h
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h
@@ -1,9 +1,8 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2023, Ayon, All rights reserved.
 
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Object.h"
 #include "OpenPypeSettings.generated.h"
 
 #define OPENPYPE_SETTINGS_FILEPATH IPluginManager::Get().FindPlugin("OpenPype")->GetBaseDir() / TEXT("Config") / TEXT("DefaultOpenPypeSettings.ini")
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeStyle.h b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h
similarity index 90%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeStyle.h
rename to openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h
index fbc8bcdd5b..0e4af129d0 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypeStyle.h
+++ b/openpype/hosts/unreal/integration/UE_4.7/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 #include "CoreMinimal.h"
 
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainer.cpp b/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainer.cpp
deleted file mode 100644
index c766f87a8e..0000000000
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainer.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#include "AssetContainer.h"
-#include "AssetRegistryModule.h"
-#include "Misc/PackageName.h"
-#include "Engine.h"
-#include "Containers/UnrealString.h"
-
-UAssetContainer::UAssetContainer(const FObjectInitializer& ObjectInitializer)
-: UAssetUserData(ObjectInitializer)
-{
-	FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>("AssetRegistry");
-	FString path = UAssetContainer::GetPathName();
-	UE_LOG(LogTemp, Warning, TEXT("UAssetContainer %s"), *path);
-	FARFilter Filter;
-	Filter.PackagePaths.Add(FName(*path));
-	
-	AssetRegistryModule.Get().OnAssetAdded().AddUObject(this, &UAssetContainer::OnAssetAdded);
-	AssetRegistryModule.Get().OnAssetRemoved().AddUObject(this, &UAssetContainer::OnAssetRemoved);
-	AssetRegistryModule.Get().OnAssetRenamed().AddUObject(this, &UAssetContainer::OnAssetRenamed);
-}
-
-void UAssetContainer::OnAssetAdded(const FAssetData& AssetData)
-{
-	TArray<FString> split;
-
-	// get directory of current container
-	FString selfFullPath = UAssetContainer::GetPathName();
-	FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath);
-
-	// get asset path and class
-	FString assetPath = AssetData.GetFullName();
-	FString assetFName = AssetData.AssetClass.ToString();
-	
-	// split path
-	assetPath.ParseIntoArray(split, TEXT(" "), true);
-
-	FString assetDir = FPackageName::GetLongPackagePath(*split[1]);
-	
-	// take interest only in paths starting with path of current container
-	if (assetDir.StartsWith(*selfDir))
-	{
-		// exclude self
-		if (assetFName != "AssetContainer")
-		{
-			assets.Add(assetPath);
-			assetsData.Add(AssetData);
-			UE_LOG(LogTemp, Log, TEXT("%s: asset added to %s"), *selfFullPath, *selfDir);
-		}
-	}
-}
-
-void UAssetContainer::OnAssetRemoved(const FAssetData& AssetData)
-{
-	TArray<FString> split;
-
-	// get directory of current container
-	FString selfFullPath = UAssetContainer::GetPathName();
-	FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath);
-
-	// get asset path and class
-	FString assetPath = AssetData.GetFullName();
-	FString assetFName = AssetData.AssetClass.ToString();
-
-	// split path
-	assetPath.ParseIntoArray(split, TEXT(" "), true);
-
-	FString assetDir = FPackageName::GetLongPackagePath(*split[1]);
-
-	// take interest only in paths starting with path of current container
-	FString path = UAssetContainer::GetPathName();
-	FString lpp = FPackageName::GetLongPackagePath(*path);
-
-	if (assetDir.StartsWith(*selfDir))
-	{
-		// exclude self
-		if (assetFName != "AssetContainer")
-		{
-			// UE_LOG(LogTemp, Warning, TEXT("%s: asset removed"), *lpp);
-			assets.Remove(assetPath);
-			assetsData.Remove(AssetData);
-		}
-	}
-}
-
-void UAssetContainer::OnAssetRenamed(const FAssetData& AssetData, const FString& str)
-{
-	TArray<FString> split;
-
-	// get directory of current container
-	FString selfFullPath = UAssetContainer::GetPathName();
-	FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath);
-
-	// get asset path and class
-	FString assetPath = AssetData.GetFullName();
-	FString assetFName = AssetData.AssetClass.ToString();
-
-	// split path
-	assetPath.ParseIntoArray(split, TEXT(" "), true);
-
-	FString assetDir = FPackageName::GetLongPackagePath(*split[1]);
-	if (assetDir.StartsWith(*selfDir))
-	{
-		// exclude self
-		if (assetFName != "AssetContainer")
-		{
-
-			assets.Remove(str);
-			assets.Add(assetPath);
-			assetsData.Remove(AssetData);
-			// UE_LOG(LogTemp, Warning, TEXT("%s: asset renamed %s"), *lpp, *str);
-		}
-	}
-}
-
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainerFactory.cpp b/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainerFactory.cpp
deleted file mode 100644
index b943150bdd..0000000000
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/AssetContainerFactory.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "AssetContainerFactory.h"
-#include "AssetContainer.h"
-
-UAssetContainerFactory::UAssetContainerFactory(const FObjectInitializer& ObjectInitializer)
-	: UFactory(ObjectInitializer)
-{
-	SupportedClass = UAssetContainer::StaticClass();
-	bCreateNew = false;
-	bEditorImport = true;
-}
-
-UObject* UAssetContainerFactory::FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn)
-{
-	UAssetContainer* AssetContainer = NewObject<UAssetContainer>(InParent, Class, Name, Flags);
-	return AssetContainer;
-}
-
-bool UAssetContainerFactory::ShouldShowInNewMenu() const {
-	return false;
-}
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainer.h b/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainer.h
deleted file mode 100644
index 3c2a360c78..0000000000
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainer.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "UObject/NoExportTypes.h"
-#include "Engine/AssetUserData.h"
-#include "AssetData.h"
-#include "AssetContainer.generated.h"
-
-/**
- * 
- */
-UCLASS(Blueprintable)
-class OPENPYPE_API UAssetContainer : public UAssetUserData
-{
-	GENERATED_BODY()
-	
-public:
-
-	UAssetContainer(const FObjectInitializer& ObjectInitalizer);
-	// ~UAssetContainer();
-
-	UPROPERTY(EditAnywhere, BlueprintReadOnly)
-		TArray<FString> assets;
-
-	// There seems to be no reflection option to expose array of FAssetData
-	/*
-	UPROPERTY(Transient, BlueprintReadOnly, Category = "Python", meta=(DisplayName="Assets Data"))
-		TArray<FAssetData> assetsData;
-	*/
-private:
-	TArray<FAssetData> assetsData;
-	void OnAssetAdded(const FAssetData& AssetData);
-	void OnAssetRemoved(const FAssetData& AssetData);
-	void OnAssetRenamed(const FAssetData& AssetData, const FString& str);
-};
-
-
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainerFactory.h b/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainerFactory.h
deleted file mode 100644
index 331ce6bb50..0000000000
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/AssetContainerFactory.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Factories/Factory.h"
-#include "AssetContainerFactory.generated.h"
-
-/**
- * 
- */
-UCLASS()
-class OPENPYPE_API UAssetContainerFactory : public UFactory
-{
-	GENERATED_BODY()
-
-public:
-	UAssetContainerFactory(const FObjectInitializer& ObjectInitializer);
-	virtual UObject* FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) override;
-	virtual bool ShouldShowInNewMenu() const override;
-};
\ No newline at end of file
diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore
new file mode 100644
index 0000000000..80814ef0a6
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/.gitignore
@@ -0,0 +1,41 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+/Saved
+/DerivedDataCache
+/Intermediate
+/Binaries
+/Content
+/Config
+/.idea
+/.vs
\ No newline at end of file
diff --git a/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject
new file mode 100644
index 0000000000..c8dc1c673e
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/CommandletProject/CommandletProject.uproject
@@ -0,0 +1,20 @@
+{
+	"FileVersion": 3,
+	"EngineAssociation": "5.0",
+	"Category": "",
+	"Description": "",
+	"Plugins": [
+		{
+			"Name": "ModelingToolsEditorMode",
+			"Enabled": true,
+			"TargetAllowList": [
+				"Editor"
+			]
+		},
+		{
+			"Name": "OpenPype",
+			"Enabled": true,
+			"Type": "Editor"
+		}
+	]
+}
\ No newline at end of file
diff --git a/openpype/hosts/unreal/integration/UE_5.0/.gitignore b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/.gitignore
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_5.0/.gitignore
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/.gitignore
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Config/DefaultOpenPypeSettings.ini b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/DefaultOpenPypeSettings.ini
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_5.0/Config/DefaultOpenPypeSettings.ini
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/DefaultOpenPypeSettings.ini
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/FilterPlugin.ini b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/FilterPlugin.ini
new file mode 100644
index 0000000000..ccebca2f32
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Config/FilterPlugin.ini
@@ -0,0 +1,8 @@
+[FilterPlugin]
+; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
+; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
+;
+; Examples:
+;    /README.txt
+;    /Extras/...
+;    /Binaries/ThirdParty/*.dll
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Content/Python/init_unreal.py b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Content/Python/init_unreal.py
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_5.0/Content/Python/init_unreal.py
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Content/Python/init_unreal.py
diff --git a/openpype/hosts/unreal/integration/UE_4.7/OpenPype.uplugin b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin
similarity index 91%
rename from openpype/hosts/unreal/integration/UE_4.7/OpenPype.uplugin
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin
index 4c7a74403c..ff08edc13e 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/OpenPype.uplugin
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/OpenPype.uplugin
@@ -11,9 +11,9 @@
 	"MarketplaceURL": "",
 	"SupportURL": "https://pype.club/",
 	"CanContainContent": true,
-	"IsBetaVersion": true,
+	"EngineVersion": "5.0",
 	"IsExperimentalVersion": false,
-	"Installed": false,
+	"Installed": true,
 	"Modules": [
 		{
 			"Name": "OpenPype",
diff --git a/openpype/hosts/unreal/integration/UE_5.0/README.md b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/README.md
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_5.0/README.md
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/README.md
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Resources/openpype128.png b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype128.png
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_5.0/Resources/openpype128.png
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype128.png
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Resources/openpype40.png b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype40.png
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_5.0/Resources/openpype40.png
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype40.png
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Resources/openpype512.png b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype512.png
similarity index 100%
rename from openpype/hosts/unreal/integration/UE_5.0/Resources/openpype512.png
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Resources/openpype512.png
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/OpenPype.Build.cs b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs
similarity index 88%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/OpenPype.Build.cs
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs
index d853ec028f..e1087fd720 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/OpenPype.Build.cs
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/OpenPype.Build.cs
@@ -1,4 +1,4 @@
-// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+// Copyright 2023, Ayon, All rights reserved.
 
 using UnrealBuildTool;
 
@@ -10,7 +10,7 @@ public class OpenPype : ModuleRules
 	    bLegacyPublicIncludePaths = false;
 	    ShadowVariableWarningLevel = WarningLevel.Error;
 		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
-		IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_0;
+		//IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_0;
 		
 		PublicIncludePaths.AddRange(
 			new string[] {
@@ -30,14 +30,15 @@ public class OpenPype : ModuleRules
 			new string[]
 			{
 				"Core",
+				"CoreUObject"
 				// ... add other public dependencies that you statically link with here ...
 			}
 			);
-			
 		
 		PrivateDependencyModuleNames.AddRange(
 			new string[]
 			{
+				"GameProjectGeneration",
 				"Projects",
 				"InputCore",
 				"EditorFramework",
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp
new file mode 100644
index 0000000000..abb1975027
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/Implementations/OPGenerateProjectCommandlet.cpp
@@ -0,0 +1,141 @@
+// Copyright 2023, Ayon, All rights reserved.
+#include "Commandlets/Implementations/OPGenerateProjectCommandlet.h"
+
+#include "Editor.h"
+#include "GameProjectUtils.h"
+#include "OPConstants.h"
+#include "Commandlets/OPActionResult.h"
+#include "ProjectDescriptor.h"
+
+int32 UOPGenerateProjectCommandlet::Main(const FString& CommandLineParams)
+{
+	//Parses command line parameters & creates structure FProjectInformation
+	const FOPGenerateProjectParams ParsedParams = FOPGenerateProjectParams(CommandLineParams);
+	ProjectInformation = ParsedParams.GenerateUEProjectInformation();
+
+	//Creates .uproject & other UE files
+	EVALUATE_OP_ACTION_RESULT(TryCreateProject());
+
+	//Loads created .uproject
+	EVALUATE_OP_ACTION_RESULT(TryLoadProjectDescriptor());
+
+	//Adds needed plugin to .uproject
+	AttachPluginsToProjectDescriptor();
+
+	//Saves .uproject
+	EVALUATE_OP_ACTION_RESULT(TrySave());
+
+	//When we are here, there should not be problems in generating Unreal Project for OpenPype
+	return 0;
+}
+
+
+FOPGenerateProjectParams::FOPGenerateProjectParams(): FOPGenerateProjectParams("")
+{
+}
+
+FOPGenerateProjectParams::FOPGenerateProjectParams(const FString& CommandLineParams): CommandLineParams(
+	CommandLineParams)
+{
+	UCommandlet::ParseCommandLine(*CommandLineParams, Tokens, Switches);
+}
+
+FProjectInformation FOPGenerateProjectParams::GenerateUEProjectInformation() const
+{
+	FProjectInformation ProjectInformation = FProjectInformation();
+	ProjectInformation.ProjectFilename = GetProjectFileName();
+
+	ProjectInformation.bShouldGenerateCode = IsSwitchPresent("GenerateCode");
+
+	return ProjectInformation;
+}
+
+FString FOPGenerateProjectParams::TryGetToken(const int32 Index) const
+{
+	return Tokens.IsValidIndex(Index) ? Tokens[Index] : "";
+}
+
+FString FOPGenerateProjectParams::GetProjectFileName() const
+{
+	return TryGetToken(0);
+}
+
+bool FOPGenerateProjectParams::IsSwitchPresent(const FString& Switch) const
+{
+	return INDEX_NONE != Switches.IndexOfByPredicate([&Switch](const FString& Item) -> bool
+		{
+			return Item.Equals(Switch);
+		}
+	);
+}
+
+
+UOPGenerateProjectCommandlet::UOPGenerateProjectCommandlet()
+{
+	LogToConsole = true;
+}
+
+FOP_ActionResult UOPGenerateProjectCommandlet::TryCreateProject() const
+{
+	FText FailReason;
+	FText FailLog;
+	TArray<FString> OutCreatedFiles;
+
+	if (!GameProjectUtils::CreateProject(ProjectInformation, FailReason, FailLog, &OutCreatedFiles))
+		return FOP_ActionResult(EOP_ActionResult::ProjectNotCreated, FailReason);
+	return FOP_ActionResult();
+}
+
+FOP_ActionResult UOPGenerateProjectCommandlet::TryLoadProjectDescriptor()
+{
+	FText FailReason;
+	const bool bLoaded = ProjectDescriptor.Load(ProjectInformation.ProjectFilename, FailReason);
+
+	return FOP_ActionResult(bLoaded ? EOP_ActionResult::Ok : EOP_ActionResult::ProjectNotLoaded, FailReason);
+}
+
+void UOPGenerateProjectCommandlet::AttachPluginsToProjectDescriptor()
+{
+	FPluginReferenceDescriptor OPPluginDescriptor;
+	OPPluginDescriptor.bEnabled = true;
+	OPPluginDescriptor.Name = OPConstants::OP_PluginName;
+	ProjectDescriptor.Plugins.Add(OPPluginDescriptor);
+
+	FPluginReferenceDescriptor PythonPluginDescriptor;
+	PythonPluginDescriptor.bEnabled = true;
+	PythonPluginDescriptor.Name = OPConstants::PythonScript_PluginName;
+	ProjectDescriptor.Plugins.Add(PythonPluginDescriptor);
+
+	FPluginReferenceDescriptor SequencerScriptingPluginDescriptor;
+	SequencerScriptingPluginDescriptor.bEnabled = true;
+	SequencerScriptingPluginDescriptor.Name = OPConstants::SequencerScripting_PluginName;
+	ProjectDescriptor.Plugins.Add(SequencerScriptingPluginDescriptor);
+
+	FPluginReferenceDescriptor MovieRenderPipelinePluginDescriptor;
+	MovieRenderPipelinePluginDescriptor.bEnabled = true;
+	MovieRenderPipelinePluginDescriptor.Name = OPConstants::MovieRenderPipeline_PluginName;
+	ProjectDescriptor.Plugins.Add(MovieRenderPipelinePluginDescriptor);
+
+	FPluginReferenceDescriptor EditorScriptingPluginDescriptor;
+	EditorScriptingPluginDescriptor.bEnabled = true;
+	EditorScriptingPluginDescriptor.Name = OPConstants::EditorScriptingUtils_PluginName;
+	ProjectDescriptor.Plugins.Add(EditorScriptingPluginDescriptor);
+}
+
+FOP_ActionResult UOPGenerateProjectCommandlet::TrySave()
+{
+	FText FailReason;
+	const bool bSaved = ProjectDescriptor.Save(ProjectInformation.ProjectFilename, FailReason);
+
+	return FOP_ActionResult(bSaved ? EOP_ActionResult::Ok : EOP_ActionResult::ProjectNotSaved, FailReason);
+}
+
+FOPGenerateProjectParams UOPGenerateProjectCommandlet::ParseParameters(const FString& Params) const
+{
+	FOPGenerateProjectParams ParamsResult;
+
+	TArray<FString> Tokens, Switches;
+	ParseCommandLine(*Params, Tokens, Switches);
+
+	return ParamsResult;
+}
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp
new file mode 100644
index 0000000000..23ae2dd329
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Commandlets/OPActionResult.cpp
@@ -0,0 +1,40 @@
+// Copyright 2023, Ayon, All rights reserved.
+
+#include "Commandlets/OPActionResult.h"
+#include "Logging/OP_Log.h"
+
+EOP_ActionResult::Type& FOP_ActionResult::GetStatus()
+{
+	return Status;
+}
+
+FText& FOP_ActionResult::GetReason()
+{
+	return Reason;
+}
+
+FOP_ActionResult::FOP_ActionResult():Status(EOP_ActionResult::Type::Ok)
+{
+	
+}
+
+FOP_ActionResult::FOP_ActionResult(const EOP_ActionResult::Type& InEnum):Status(InEnum)
+{
+	TryLog();
+}
+
+FOP_ActionResult::FOP_ActionResult(const EOP_ActionResult::Type& InEnum, const FText& InReason):Status(InEnum), Reason(InReason)
+{
+	TryLog();
+};
+
+bool FOP_ActionResult::IsProblem() const
+{
+	return Status != EOP_ActionResult::Ok;
+}
+
+void FOP_ActionResult::TryLog() const
+{
+	if(IsProblem())		
+		UE_LOG(LogCommandletOPGenerateProject, Error, TEXT("%s"), *Reason.ToString());		
+}
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp
new file mode 100644
index 0000000000..198fb9df0c
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/Logging/OP_Log.cpp
@@ -0,0 +1,3 @@
+// Copyright 2023, Ayon, All rights reserved.
+
+#include "Logging/OP_Log.h"
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPype.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp
similarity index 98%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPype.cpp
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp
index d23de61102..65da29da35 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPype.cpp
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPype.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPype.h"
 
 #include "ISettingsContainer.h"
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeCommands.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp
similarity index 88%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeCommands.cpp
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp
index 6187bd7c7e..881814e278 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeCommands.cpp
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeCommands.cpp
@@ -1,4 +1,4 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
+// Copyright 2023, Ayon, All rights reserved.
 
 #include "OpenPypeCommands.h"
 
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeLib.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp
similarity index 96%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeLib.cpp
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp
index a58e921288..008025e816 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeLib.cpp
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeLib.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPypeLib.h"
 
 #include "AssetViewUtils.h"
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstance.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp
similarity index 98%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstance.cpp
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp
index 0b56111a49..05d5c8a87d 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstance.cpp
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstance.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 
 #include "OpenPypePublishInstance.h"
@@ -55,7 +56,7 @@ void UOpenPypePublishInstance::OnAssetCreated(const FAssetData& InAssetData)
 	if (!IsValid(Asset))
 	{
 		UE_LOG(LogAssetData, Warning, TEXT("Asset \"%s\" is not valid! Skipping the addition."),
-		       *InAssetData.GetObjectPathString());
+		       *InAssetData.ObjectPath.ToString());
 		return;
 	}
 
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
similarity index 94%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
index 9b26da7fa4..a32ebe32cb 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePublishInstanceFactory.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPypePublishInstanceFactory.h"
 #include "OpenPypePublishInstance.h"
 
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePythonBridge.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp
similarity index 90%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePythonBridge.cpp
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp
index 8113231503..6ebfc528f0 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Private/OpenPypePythonBridge.cpp
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypePythonBridge.cpp
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #include "OpenPypePythonBridge.h"
 
 UOpenPypePythonBridge* UOpenPypePythonBridge::Get()
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeSettings.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp
similarity index 88%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeSettings.cpp
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp
index a6b9eba749..6562a81138 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeSettings.cpp
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeSettings.cpp
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2023, Ayon, All rights reserved.
 
 #include "OpenPypeSettings.h"
 
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeStyle.cpp b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp
similarity index 97%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeStyle.cpp
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp
index 49e805da4d..a4d75e048e 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/OpenPypeStyle.cpp
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Private/OpenPypeStyle.cpp
@@ -1,3 +1,5 @@
+// Copyright 2023, Ayon, All rights reserved.
+
 #include "OpenPypeStyle.h"
 #include "OpenPype.h"
 #include "Framework/Application/SlateApplication.h"
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h
new file mode 100644
index 0000000000..6a6c6406e7
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/Implementations/OPGenerateProjectCommandlet.h
@@ -0,0 +1,61 @@
+// Copyright 2023, Ayon, All rights reserved.
+#pragma once
+
+
+#include "GameProjectUtils.h"
+#include "Commandlets/OPActionResult.h"
+#include "ProjectDescriptor.h"
+#include "Commandlets/Commandlet.h"
+#include "OPGenerateProjectCommandlet.generated.h"
+
+struct FProjectDescriptor;
+struct FProjectInformation;
+
+/**
+* @brief Structure which parses command line parameters and generates FProjectInformation
+*/
+USTRUCT()
+struct FOPGenerateProjectParams
+{
+	GENERATED_BODY()
+
+private:
+	FString CommandLineParams;
+	TArray<FString> Tokens;
+	TArray<FString> Switches;
+
+public:
+	FOPGenerateProjectParams();
+	FOPGenerateProjectParams(const FString& CommandLineParams);
+
+	FProjectInformation GenerateUEProjectInformation() const;
+
+private:
+	FString TryGetToken(const int32 Index) const;
+	FString GetProjectFileName() const;
+
+	bool IsSwitchPresent(const FString& Switch) const;
+};
+ 
+UCLASS()
+class OPENPYPE_API UOPGenerateProjectCommandlet : public UCommandlet
+{
+	GENERATED_BODY()
+
+private:
+	FProjectInformation ProjectInformation;
+	FProjectDescriptor ProjectDescriptor;
+
+public:
+	UOPGenerateProjectCommandlet();
+	
+	virtual int32 Main(const FString& CommandLineParams) override;
+
+private:
+	FOPGenerateProjectParams ParseParameters(const FString& Params) const;
+	FOP_ActionResult TryCreateProject() const;
+	FOP_ActionResult TryLoadProjectDescriptor();
+	void AttachPluginsToProjectDescriptor();
+	FOP_ActionResult TrySave();
+};
+
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h
new file mode 100644
index 0000000000..c960bbf190
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Commandlets/OPActionResult.h
@@ -0,0 +1,83 @@
+// Copyright 2023, Ayon, All rights reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "OPActionResult.generated.h"
+
+/**
+ * @brief This macro returns error code when is problem or does nothing when there is no problem.
+ * @param ActionResult FOP_ActionResult structure
+ */
+#define EVALUATE_OP_ACTION_RESULT(ActionResult) \
+	if(ActionResult.IsProblem()) \
+		return ActionResult.GetStatus();
+
+/**
+* @brief This enum values are humanly readable mapping of error codes.
+* Here should be all error codes to be possible find what went wrong.
+* TODO: In the future should exists an web document where is mapped error code & what problem occured & how to repair it...
+*/
+UENUM()
+namespace EOP_ActionResult
+{
+	enum Type
+	{
+		Ok,
+		ProjectNotCreated,
+		ProjectNotLoaded,
+		ProjectNotSaved,
+		//....Here insert another values 
+
+		//Do not remove!
+		//Usable for looping through enum values
+		__Last UMETA(Hidden) 
+	};
+}
+
+
+/**
+ * @brief This struct holds action result enum and optionally reason of fail
+ */
+USTRUCT()
+struct FOP_ActionResult
+{
+	GENERATED_BODY()
+
+public:
+	/**	 @brief Default constructor usable when there is no problem */
+	FOP_ActionResult();
+
+	/**
+	 * @brief This constructor initializes variables & attempts to log when is error
+	 * @param InEnum Status
+	 */
+	FOP_ActionResult(const EOP_ActionResult::Type& InEnum);
+
+	/**
+	 * @brief This constructor initializes variables & attempts to log when is error
+	 * @param InEnum Status
+	 * @param InReason Reason of potential fail
+	 */
+	FOP_ActionResult(const EOP_ActionResult::Type& InEnum, const FText& InReason);
+
+private:
+	/** @brief Action status  */
+	EOP_ActionResult::Type Status;	
+
+	/** @brief Optional reason of fail	 */
+	FText Reason;	
+
+public:
+	/**
+	 * @brief Checks if there is problematic state
+	 * @return true when status is not equal to EOP_ActionResult::Ok
+	 */
+	bool IsProblem() const;
+	EOP_ActionResult::Type& GetStatus();
+	FText& GetReason();
+
+private:	
+	void TryLog() const;
+};
+
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h
new file mode 100644
index 0000000000..3740c5285a
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/Logging/OP_Log.h
@@ -0,0 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
+#pragma once
+
+DEFINE_LOG_CATEGORY_STATIC(LogCommandletOPGenerateProject, Log, All);
\ No newline at end of file
diff --git a/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h
new file mode 100644
index 0000000000..f4587f7a50
--- /dev/null
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OPConstants.h
@@ -0,0 +1,13 @@
+// Copyright 2023, Ayon, All rights reserved.
+#pragma once
+
+namespace OPConstants 
+{
+	const FString OP_PluginName = "OpenPype";
+	const FString PythonScript_PluginName = "PythonScriptPlugin";
+	const FString SequencerScripting_PluginName = "SequencerScripting";
+	const FString MovieRenderPipeline_PluginName = "MovieRenderPipeline";
+	const FString EditorScriptingUtils_PluginName = "EditorScriptingUtilities";
+}
+
+
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPype.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h
similarity index 86%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPype.h
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h
index 4261476da8..b89760099b 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPype.h
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPype.h
@@ -1,4 +1,4 @@
-// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
+// Copyright 2023, Ayon, All rights reserved.
 
 #pragma once
 
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeCommands.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h
similarity index 91%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeCommands.h
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h
index 62ffb8de33..99b0be26f0 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeCommands.h
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeCommands.h
@@ -1,4 +1,4 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
+// Copyright 2023, Ayon, All rights reserved.
 
 #pragma once
 
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeLib.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h
similarity index 90%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeLib.h
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h
index 06425c7c7d..ef4d1027ea 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeLib.h
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeLib.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 
 #include "Engine.h"
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstance.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h
similarity index 92%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstance.h
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h
index 146025bd6d..bce41ef1b1 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePublishInstance.h
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstance.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 
 #include "Engine.h"
@@ -17,7 +18,7 @@ public:
 	 *
 	 *	@return - Set of UObjects. Careful! They are returning raw pointers. Seems like an issue in UE5
 	 */
-	UFUNCTION(BlueprintCallable, BlueprintPure)
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python")
 	TSet<UObject*> GetInternalAssets() const
 	{
 		//For some reason it can only return Raw Pointers? Seems like an issue which they haven't fixed.
@@ -34,7 +35,7 @@ public:
 	 *
 	 *	@return - TSet of assets (UObjects). Careful! They are returning raw pointers. Seems like an issue in UE5
 	 */
-	UFUNCTION(BlueprintCallable, BlueprintPure)
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python")
 	TSet<UObject*> GetExternalAssets() const
 	{
 		//For some reason it can only return Raw Pointers? Seems like an issue which they haven't fixed.
@@ -54,7 +55,7 @@ public:
 	 *
 	 * @attention If the bAddExternalAssets variable is false, external assets won't be included!
 	 */
-	UFUNCTION(BlueprintCallable, BlueprintPure)
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Python")
 	TSet<UObject*> GetAllAssets() const
 	{
 		const TSet<TSoftObjectPtr<UObject>>& IteratedSet = bAddExternalAssets
diff --git a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
similarity index 92%
rename from openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
index 7d2c77fe6e..3fdb984411 100644
--- a/openpype/hosts/unreal/integration/UE_4.7/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePublishInstanceFactory.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 
 #include "CoreMinimal.h"
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePythonBridge.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h
similarity index 90%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePythonBridge.h
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h
index 692aab2e5e..827f76f56b 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypePythonBridge.h
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypePythonBridge.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 #include "Engine.h"
 #include "OpenPypePythonBridge.generated.h"
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeSettings.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h
similarity index 90%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeSettings.h
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h
index aca80946bb..b818fe0e95 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeSettings.h
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeSettings.h
@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Copyright 2023, Ayon, All rights reserved.
 
 #pragma once
 
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeStyle.h b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h
similarity index 89%
rename from openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeStyle.h
rename to openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h
index ae704251e1..039abe96ef 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/OpenPypeStyle.h
+++ b/openpype/hosts/unreal/integration/UE_5.0/OpenPype/Source/OpenPype/Public/OpenPypeStyle.h
@@ -1,3 +1,4 @@
+// Copyright 2023, Ayon, All rights reserved.
 #pragma once
 #include "CoreMinimal.h"
 #include "Styling/SlateStyle.h"
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainer.cpp b/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainer.cpp
deleted file mode 100644
index 61e563f729..0000000000
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainer.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#include "AssetContainer.h"
-#include "AssetRegistry/AssetRegistryModule.h"
-#include "Misc/PackageName.h"
-#include "Engine.h"
-#include "Containers/UnrealString.h"
-
-UAssetContainer::UAssetContainer(const FObjectInitializer& ObjectInitializer)
-: UAssetUserData(ObjectInitializer)
-{
-	FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>("AssetRegistry");
-	FString path = UAssetContainer::GetPathName();
-	UE_LOG(LogTemp, Warning, TEXT("UAssetContainer %s"), *path);
-	FARFilter Filter;
-	Filter.PackagePaths.Add(FName(*path));
-	
-	AssetRegistryModule.Get().OnAssetAdded().AddUObject(this, &UAssetContainer::OnAssetAdded);
-	AssetRegistryModule.Get().OnAssetRemoved().AddUObject(this, &UAssetContainer::OnAssetRemoved);
-	AssetRegistryModule.Get().OnAssetRenamed().AddUObject(this, &UAssetContainer::OnAssetRenamed);
-}
-
-void UAssetContainer::OnAssetAdded(const FAssetData& AssetData)
-{
-	TArray<FString> split;
-
-	// get directory of current container
-	FString selfFullPath = UAssetContainer::GetPathName();
-	FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath);
-
-	// get asset path and class
-	FString assetPath = AssetData.GetFullName();
-	FString assetFName = AssetData.AssetClassPath.ToString();
-	UE_LOG(LogTemp, Log, TEXT("asset name %s"), *assetFName);
-	// split path
-	assetPath.ParseIntoArray(split, TEXT(" "), true);
-
-	FString assetDir = FPackageName::GetLongPackagePath(*split[1]);
-	
-	// take interest only in paths starting with path of current container
-	if (assetDir.StartsWith(*selfDir))
-	{
-		// exclude self
-		if (assetFName != "AssetContainer")
-		{
-			assets.Add(assetPath);
-			assetsData.Add(AssetData);
-			UE_LOG(LogTemp, Log, TEXT("%s: asset added to %s"), *selfFullPath, *selfDir);
-		}
-	}
-}
-
-void UAssetContainer::OnAssetRemoved(const FAssetData& AssetData)
-{
-	TArray<FString> split;
-
-	// get directory of current container
-	FString selfFullPath = UAssetContainer::GetPathName();
-	FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath);
-
-	// get asset path and class
-	FString assetPath = AssetData.GetFullName();
-	FString assetFName = AssetData.AssetClassPath.ToString();
-
-	// split path
-	assetPath.ParseIntoArray(split, TEXT(" "), true);
-
-	FString assetDir = FPackageName::GetLongPackagePath(*split[1]);
-
-	// take interest only in paths starting with path of current container
-	FString path = UAssetContainer::GetPathName();
-	FString lpp = FPackageName::GetLongPackagePath(*path);
-
-	if (assetDir.StartsWith(*selfDir))
-	{
-		// exclude self
-		if (assetFName != "AssetContainer")
-		{
-			// UE_LOG(LogTemp, Warning, TEXT("%s: asset removed"), *lpp);
-			assets.Remove(assetPath);
-			assetsData.Remove(AssetData);
-		}
-	}
-}
-
-void UAssetContainer::OnAssetRenamed(const FAssetData& AssetData, const FString& str)
-{
-	TArray<FString> split;
-
-	// get directory of current container
-	FString selfFullPath = UAssetContainer::GetPathName();
-	FString selfDir = FPackageName::GetLongPackagePath(*selfFullPath);
-
-	// get asset path and class
-	FString assetPath = AssetData.GetFullName();
-	FString assetFName = AssetData.AssetClassPath.ToString();
-
-	// split path
-	assetPath.ParseIntoArray(split, TEXT(" "), true);
-
-	FString assetDir = FPackageName::GetLongPackagePath(*split[1]);
-	if (assetDir.StartsWith(*selfDir))
-	{
-		// exclude self
-		if (assetFName != "AssetContainer")
-		{
-
-			assets.Remove(str);
-			assets.Add(assetPath);
-			assetsData.Remove(AssetData);
-			// UE_LOG(LogTemp, Warning, TEXT("%s: asset renamed %s"), *lpp, *str);
-		}
-	}
-}
-
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainerFactory.cpp b/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainerFactory.cpp
deleted file mode 100644
index b943150bdd..0000000000
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Private/AssetContainerFactory.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "AssetContainerFactory.h"
-#include "AssetContainer.h"
-
-UAssetContainerFactory::UAssetContainerFactory(const FObjectInitializer& ObjectInitializer)
-	: UFactory(ObjectInitializer)
-{
-	SupportedClass = UAssetContainer::StaticClass();
-	bCreateNew = false;
-	bEditorImport = true;
-}
-
-UObject* UAssetContainerFactory::FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn)
-{
-	UAssetContainer* AssetContainer = NewObject<UAssetContainer>(InParent, Class, Name, Flags);
-	return AssetContainer;
-}
-
-bool UAssetContainerFactory::ShouldShowInNewMenu() const {
-	return false;
-}
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainer.h b/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainer.h
deleted file mode 100644
index 2c06e59d6f..0000000000
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainer.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "UObject/NoExportTypes.h"
-#include "Engine/AssetUserData.h"
-#include "AssetRegistry/AssetData.h"
-#include "AssetContainer.generated.h"
-
-/**
- * 
- */
-UCLASS(Blueprintable)
-class OPENPYPE_API UAssetContainer : public UAssetUserData
-{
-	GENERATED_BODY()
-	
-public:
-
-	UAssetContainer(const FObjectInitializer& ObjectInitalizer);
-	// ~UAssetContainer();
-
-	UPROPERTY(EditAnywhere, BlueprintReadOnly)
-		TArray<FString> assets;
-
-	// There seems to be no reflection option to expose array of FAssetData
-	/*
-	UPROPERTY(Transient, BlueprintReadOnly, Category = "Python", meta=(DisplayName="Assets Data"))
-		TArray<FAssetData> assetsData;
-	*/
-private:
-	TArray<FAssetData> assetsData;
-	void OnAssetAdded(const FAssetData& AssetData);
-	void OnAssetRemoved(const FAssetData& AssetData);
-	void OnAssetRenamed(const FAssetData& AssetData, const FString& str);
-};
-
-
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainerFactory.h b/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainerFactory.h
deleted file mode 100644
index 331ce6bb50..0000000000
--- a/openpype/hosts/unreal/integration/UE_5.0/Source/OpenPype/Public/AssetContainerFactory.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Factories/Factory.h"
-#include "AssetContainerFactory.generated.h"
-
-/**
- * 
- */
-UCLASS()
-class OPENPYPE_API UAssetContainerFactory : public UFactory
-{
-	GENERATED_BODY()
-
-public:
-	UAssetContainerFactory(const FObjectInitializer& ObjectInitializer);
-	virtual UObject* FactoryCreateNew(UClass* Class, UObject* InParent, FName Name, EObjectFlags Flags, UObject* Context, FFeedbackContext* Warn) override;
-	virtual bool ShouldShowInNewMenu() const override;
-};
\ No newline at end of file
diff --git a/openpype/hosts/unreal/lib.py b/openpype/hosts/unreal/lib.py
index 095f5e414b..28a5106042 100644
--- a/openpype/hosts/unreal/lib.py
+++ b/openpype/hosts/unreal/lib.py
@@ -4,6 +4,10 @@
 import os
 import platform
 import json
+
+from typing import List
+
+import openpype
 from distutils import dir_util
 import subprocess
 import re
@@ -73,7 +77,7 @@ def get_engine_versions(env=None):
     return OrderedDict()
 
 
-def get_editor_executable_path(engine_path: Path, engine_version: str) -> Path:
+def get_editor_exe_path(engine_path: Path, engine_version: str) -> Path:
     """Get UE Editor executable path."""
     ue_path = engine_path / "Engine/Binaries"
     if platform.system().lower() == "windows":
@@ -214,77 +218,71 @@ def create_unreal_project(project_name: str,
     # 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.
-    ue_modules = Path()
-    if platform.system().lower() == "windows":
-        ue_modules_path = engine_path / "Engine/Binaries/Win64"
-        if ue_version.split(".")[0] == "4":
-            ue_modules_path /= "UE4Editor.modules"
-        elif ue_version.split(".")[0] == "5":
-            ue_modules_path /= "UnrealEditor.modules"
-        ue_modules = Path(ue_modules_path)
 
-    if platform.system().lower() == "linux":
-        ue_modules = Path(os.path.join(engine_path, "Engine", "Binaries",
-                                        "Linux", "UE4Editor.modules"))
+    # engine_path should be the location of UE_X.X folder
 
-    if platform.system().lower() == "darwin":
-        ue_modules = Path(os.path.join(engine_path, "Engine", "Binaries",
-                                        "Mac", "UE4Editor.modules"))
+    ue_editor_exe: Path = get_editor_exe_path(engine_path, ue_version)
+    cmdlet_project: Path = get_path_to_cmdlet_project(ue_version)
 
-    if ue_modules.exists():
-        print("--- Loading Engine ID from modules file ...")
-        with open(ue_modules, "r") as mp:
-            loaded_modules = json.load(mp)
+    project_file = pr_dir / f"{project_name}.uproject"
 
-        if loaded_modules.get("BuildId"):
-            ue_id = "{" + loaded_modules.get("BuildId") + "}"
-
-    plugins_path = None
-    if os.path.isdir(env.get("OPENPYPE_UNREAL_PLUGIN", "")):
-        # copy plugin to correct path under project
-        plugins_path = pr_dir / "Plugins"
-        openpype_plugin_path = plugins_path / "OpenPype"
-        if not openpype_plugin_path.is_dir():
-            openpype_plugin_path.mkdir(parents=True, exist_ok=True)
-            dir_util._path_created = {}
-            dir_util.copy_tree(os.environ.get("OPENPYPE_UNREAL_PLUGIN"),
-                               openpype_plugin_path.as_posix())
-
-            if not (openpype_plugin_path / "Binaries").is_dir() \
-                    or not (openpype_plugin_path / "Intermediate").is_dir():
-                dev_mode = True
-
-    # data for project file
-    data = {
-        "FileVersion": 3,
-        "EngineAssociation": ue_id,
-        "Category": "",
-        "Description": "",
-        "Plugins": [
-            {"Name": "PythonScriptPlugin", "Enabled": True},
-            {"Name": "EditorScriptingUtilities", "Enabled": True},
-            {"Name": "SequencerScripting", "Enabled": True},
-            {"Name": "MovieRenderPipeline", "Enabled": True},
-            {"Name": "OpenPype", "Enabled": True}
-        ]
-    }
+    print("--- Generating a new project ...")
+    commandlet_cmd = [f'{ue_editor_exe.as_posix()}',
+                      f'{cmdlet_project.as_posix()}',
+                      f'-run=OPGenerateProject',
+                      f'{project_file.resolve().as_posix()}']
 
     if dev_mode or preset["dev_mode"]:
-        # this will add the project module and necessary source file to
-        # make it a C++ project and to (hopefully) make Unreal Editor to
-        # compile all # sources at start
+        commandlet_cmd.append('-GenerateCode')
 
-        data["Modules"] = [{
-            "Name": project_name,
-            "Type": "Runtime",
-            "LoadingPhase": "Default",
-            "AdditionalDependencies": ["Engine"],
-        }]
+    gen_process = subprocess.Popen(commandlet_cmd,
+                                   stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE)
 
-    # write project file
-    project_file = pr_dir / f"{project_name}.uproject"
-    with open(project_file, mode="w") as pf:
-        json.dump(data, pf, indent=4)
+    for line in gen_process.stdout:
+        print(line.decode(), end='')
+    gen_process.stdout.close()
+    return_code = gen_process.wait()
+
+    if return_code and return_code != 0:
+        raise RuntimeError(f'Failed to generate \'{project_name}\' project! '
+                           f'Exited with return code {return_code}')
+
+    print("--- Project has been generated successfully.")
+
+    with open(project_file.as_posix(), mode="r+") as pf:
+        pf_json = json.load(pf)
+        pf_json["EngineAssociation"] = _get_build_id(engine_path, ue_version)
+        pf.seek(0)
+        json.dump(pf_json, pf, indent=4)
+        pf.truncate()
+        print(f'--- Engine ID has been written into the project file')
+
+    if dev_mode or preset["dev_mode"]:
+        u_build_tool = get_path_to_ubt(engine_path, ue_version)
+
+        arch = "Win64"
+        if platform.system().lower() == "windows":
+            arch = "Win64"
+        elif platform.system().lower() == "linux":
+            arch = "Linux"
+        elif platform.system().lower() == "darwin":
+            # we need to test this out
+            arch = "Mac"
+
+        command1 = [u_build_tool.as_posix(), "-projectfiles",
+                    f"-project={project_file}", "-progress"]
+
+        subprocess.run(command1)
+
+        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)
 
     # ensure we have PySide2 installed in engine
     python_path = None
@@ -307,176 +305,123 @@ def create_unreal_project(project_name: str,
     subprocess.check_call(
         [python_path.as_posix(), "-m", "pip", "install", "pyside2"])
 
-    if dev_mode or preset["dev_mode"]:
-        _prepare_cpp_project(project_file, engine_path, ue_version)
+
+def get_path_to_uat(engine_path: Path) -> Path:
+    if platform.system().lower() == "windows":
+        return engine_path / "Engine/Build/BatchFiles/RunUAT.bat"
+
+    if platform.system().lower() == "linux" \
+            or platform.system().lower() == "darwin":
+        return engine_path / "Engine/Build/BatchFiles/RunUAT.sh"
 
 
-def _prepare_cpp_project(
-        project_file: Path, engine_path: Path, ue_version: str) -> None:
-    """Prepare CPP Unreal Project.
+def get_path_to_cmdlet_project(ue_version: str) -> Path:
+    cmd_project = Path(os.path.dirname(os.path.abspath(openpype.__file__)))
 
-    This function will add source files needed for project to be
-    rebuild along with the OpenPype integration plugin.
+    # For now, only tested on Windows (For Linux and Mac it has to be implemented)
+    if ue_version.split(".")[0] == "4":
+        cmd_project /= "hosts/unreal/integration/UE_4.7"
+    elif ue_version.split(".")[0] == "5":
+        cmd_project /= "hosts/unreal/integration/UE_5.0"
 
-    There seems not to be automated way to do it from command line.
-    But there might be way to create at least those target and build files
-    by some generator. This needs more research as manually writing
-    those files is rather hackish. :skull_and_crossbones:
+    return cmd_project / "CommandletProject/CommandletProject.uproject"
 
 
-    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
-
-    sources_dir.mkdir(parents=True, exist_ok=True)
-    (project_dir / "Content").mkdir(parents=True, exist_ok=True)
-
-    module_target = '''
-using UnrealBuildTool;
-using System.Collections.Generic;
-
-public class {0}Target : TargetRules
-{{
-    public {0}Target( TargetInfo Target) : base(Target)
-    {{
-        Type = TargetType.Game;
-        ExtraModuleNames.AddRange( new string[] {{ "{0}" }} );
-    }}
-}}
-'''.format(project_name)
-
-    editor_module_target = '''
-using UnrealBuildTool;
-using System.Collections.Generic;
-
-public class {0}EditorTarget : TargetRules
-{{
-    public {0}EditorTarget( TargetInfo Target) : base(Target)
-    {{
-        Type = TargetType.Editor;
-
-        ExtraModuleNames.AddRange( new string[] {{ "{0}" }} );
-    }}
-}}
-'''.format(project_name)
-
-    module_build = '''
-using UnrealBuildTool;
-public class {0} : ModuleRules
-{{
-    public {0}(ReadOnlyTargetRules Target) : base(Target)
-    {{
-        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
-        PublicDependencyModuleNames.AddRange(new string[] {{ "Core",
-            "CoreUObject", "Engine", "InputCore" }});
-        PrivateDependencyModuleNames.AddRange(new string[] {{  }});
-    }}
-}}
-'''.format(project_name)
-
-    module_cpp = '''
-#include "{0}.h"
-#include "Modules/ModuleManager.h"
-
-IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, {0}, "{0}" );
-'''.format(project_name)
-
-    module_header = '''
-#pragma once
-#include "CoreMinimal.h"
-'''
-
-    game_mode_cpp = '''
-#include "{0}GameModeBase.h"
-'''.format(project_name)
-
-    game_mode_h = '''
-#pragma once
-
-#include "CoreMinimal.h"
-#include "GameFramework/GameModeBase.h"
-#include "{0}GameModeBase.generated.h"
-
-UCLASS()
-class {1}_API A{0}GameModeBase : public AGameModeBase
-{{
-    GENERATED_BODY()
-}};
-'''.format(project_name, project_name.upper())
-
-    with open(targets_dir / f"{project_name}.Target.cs", mode="w") as f:
-        f.write(module_target)
-
-    with open(targets_dir / f"{project_name}Editor.Target.cs", mode="w") as f:
-        f.write(editor_module_target)
-
-    with open(sources_dir / f"{project_name}.Build.cs", mode="w") as f:
-        f.write(module_build)
-
-    with open(sources_dir / f"{project_name}.cpp", mode="w") as f:
-        f.write(module_cpp)
-
-    with open(sources_dir / f"{project_name}.h", mode="w") as f:
-        f.write(module_header)
-
-    with open(sources_dir / f"{project_name}GameModeBase.cpp", mode="w") as f:
-        f.write(game_mode_cpp)
-
-    with open(sources_dir / f"{project_name}GameModeBase.h", mode="w") as f:
-        f.write(game_mode_h)
-
+def get_path_to_ubt(engine_path: Path, ue_version: str) -> Path:
     u_build_tool_path = engine_path / "Engine/Binaries/DotNET"
+
     if ue_version.split(".")[0] == "4":
         u_build_tool_path /= "UnrealBuildTool.exe"
     elif ue_version.split(".")[0] == "5":
         u_build_tool_path /= "UnrealBuildTool/UnrealBuildTool.exe"
-    u_build_tool = Path(u_build_tool_path)
-    u_header_tool = None
 
-    arch = "Win64"
+    return Path(u_build_tool_path)
+
+
+def _get_build_id(engine_path: Path, ue_version: str) -> str:
+    ue_modules = Path()
     if platform.system().lower() == "windows":
-        arch = "Win64"
-        u_header_tool = Path(
-            engine_path / "Engine/Binaries/Win64/UnrealHeaderTool.exe")
-    elif platform.system().lower() == "linux":
-        arch = "Linux"
-        u_header_tool = Path(
-            engine_path / "Engine/Binaries/Linux/UnrealHeaderTool")
-    elif platform.system().lower() == "darwin":
-        # we need to test this out
-        arch = "Mac"
-        u_header_tool = Path(
-            engine_path / "Engine/Binaries/Mac/UnrealHeaderTool")
+        ue_modules_path = engine_path / "Engine/Binaries/Win64"
+        if ue_version.split(".")[0] == "4":
+            ue_modules_path /= "UE4Editor.modules"
+        elif ue_version.split(".")[0] == "5":
+            ue_modules_path /= "UnrealEditor.modules"
+        ue_modules = Path(ue_modules_path)
 
-    if not u_header_tool:
-        raise NotImplementedError("Unsupported platform")
+    if platform.system().lower() == "linux":
+        ue_modules = Path(os.path.join(engine_path, "Engine", "Binaries",
+                                       "Linux", "UE4Editor.modules"))
 
-    command1 = [u_build_tool.as_posix(), "-projectfiles",
-                f"-project={project_file}", "-progress"]
+    if platform.system().lower() == "darwin":
+        ue_modules = Path(os.path.join(engine_path, "Engine", "Binaries",
+                                       "Mac", "UE4Editor.modules"))
 
-    subprocess.run(command1)
+    if ue_modules.exists():
+        print("--- Loading Engine ID from modules file ...")
+        with open(ue_modules, "r") as mp:
+            loaded_modules = json.load(mp)
 
-    command2 = [u_build_tool.as_posix(),
-                f"-ModuleWithSuffix={project_name},3555", arch,
-                "Development", "-TargetType=Editor",
-                f'-Project={project_file}',
-                f'{project_file}',
-                "-IgnoreJunk"]
+        if loaded_modules.get("BuildId"):
+            return "{" + loaded_modules.get("BuildId") + "}"
 
-    subprocess.run(command2)
 
-    """
-    uhtmanifest = os.path.join(os.path.dirname(project_file),
-                               f"{project_name}.uhtmanifest")
+def try_installing_plugin(engine_path: Path, env: dict = None) -> None:
+    env = env or os.environ
 
-    command3 = [u_header_tool, f'"{project_file}"', f'"{uhtmanifest}"',
-                "-Unattended", "-WarningsAsErrors", "-installed"]
+    integration_plugin_path: Path = Path(env.get("OPENPYPE_UNREAL_PLUGIN", ""))
 
-    subprocess.run(command3)
-    """
+    if not os.path.isdir(integration_plugin_path):
+        raise RuntimeError("Path to the integration plugin is null!")
+
+    # Create a path to the plugin in the engine
+    op_plugin_path: Path = engine_path / "Engine/Plugins/Marketplace/OpenPype"
+
+    if not op_plugin_path.is_dir():
+        print("--- OpenPype Plugin is not present. Installing ...")
+        op_plugin_path.mkdir(parents=True, exist_ok=True)
+
+        engine_plugin_config_path: Path = op_plugin_path / "Config"
+        engine_plugin_config_path.mkdir(exist_ok=True)
+
+        dir_util._path_created = {}
+
+    if not (op_plugin_path / "Binaries").is_dir() \
+            or not (op_plugin_path / "Intermediate").is_dir():
+        print("--- Binaries are not present. Building the plugin ...")
+        _build_and_move_plugin(engine_path, op_plugin_path, env)
+
+
+def _build_and_move_plugin(engine_path: Path,
+                           plugin_build_path: Path,
+                           env: dict = None) -> None:
+    uat_path: Path = get_path_to_uat(engine_path)
+
+    env = env or os.environ
+    integration_plugin_path: Path = Path(env.get("OPENPYPE_UNREAL_PLUGIN", ""))
+
+    if uat_path.is_file():
+        temp_dir: Path = integration_plugin_path.parent / "Temp"
+        temp_dir.mkdir(exist_ok=True)
+        uplugin_path: Path = integration_plugin_path / "OpenPype.uplugin"
+
+        # in order to successfully build the plugin,
+        # It must be built outside the Engine directory and then moved
+        build_plugin_cmd: List[str] = [f'{uat_path.as_posix()}',
+                                       'BuildPlugin',
+                                       f'-Plugin={uplugin_path.as_posix()}',
+                                       f'-Package={temp_dir.as_posix()}']
+        subprocess.run(build_plugin_cmd)
+
+        # Copy the contents of the 'Temp' dir into the
+        # 'OpenPype' directory in the engine
+        dir_util.copy_tree(temp_dir.as_posix(), plugin_build_path.as_posix())
+
+        # We need to also copy the config folder.
+        # The UAT doesn't include the Config folder in the build
+        plugin_install_config_path: Path = plugin_build_path / "Config"
+        integration_plugin_config_path = integration_plugin_path / "Config"
+
+        dir_util.copy_tree(integration_plugin_config_path.as_posix(),
+                           plugin_install_config_path.as_posix())
+
+        dir_util.remove_tree(temp_dir.as_posix())
diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 8748da1b35..5325715e38 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -434,7 +434,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         self.log.info(
             "Finished copying %i files" % len(resource_files))
 
-    def _create_instances_for_aov(self, instance_data, exp_files):
+    def _create_instances_for_aov(
+        self, instance_data, exp_files, additional_data
+    ):
         """Create instance for each AOV found.
 
         This will create new instance for every aov it can detect in expected
@@ -536,6 +538,14 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
             else:
                 files = os.path.basename(col)
 
+            # Copy render product "colorspace" data to representation.
+            colorspace = ""
+            products = additional_data["renderProducts"].layer_data.products
+            for product in products:
+                if product.productName == aov:
+                    colorspace = product.colorspace
+                    break
+
             rep = {
                 "name": ext,
                 "ext": ext,
@@ -545,7 +555,16 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                 # If expectedFile are absolute, we need only filenames
                 "stagingDir": staging,
                 "fps": new_instance.get("fps"),
-                "tags": ["review"] if preview else []
+                "tags": ["review"] if preview else [],
+                "colorspaceData": {
+                    "colorspace": colorspace,
+                    "config": {
+                        "path": additional_data["colorspaceConfig"],
+                        "template": additional_data["colorspaceTemplate"]
+                    },
+                    "display": additional_data["display"],
+                    "view": additional_data["view"]
+                }
             }
 
             # support conversion from tiled to scanline
@@ -569,7 +588,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
             self.log.debug("instances:{}".format(instances))
         return instances
 
-    def _get_representations(self, instance, exp_files):
+    def _get_representations(self, instance, exp_files, additional_data):
         """Create representations for file sequences.
 
         This will return representations of expected files if they are not
@@ -914,6 +933,16 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
 
         self.log.info(data.get("expectedFiles"))
 
+        additional_data = {
+            "renderProducts": instance.data["renderProducts"],
+            "colorspaceConfig": instance.data["colorspaceConfig"],
+            "display": instance.data["colorspaceDisplay"],
+            "view": instance.data["colorspaceView"],
+            "colorspaceTemplate": instance.data["colorspaceConfig"].replace(
+                str(context.data["anatomy"].roots["work"]), "{root[work]}"
+            )
+        }
+
         if isinstance(data.get("expectedFiles")[0], dict):
             # we cannot attach AOVs to other subsets as we consider every
             # AOV subset of its own.
@@ -928,7 +957,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
             #       there are multiple renderable cameras in scene)
             instances = self._create_instances_for_aov(
                 instance_skeleton_data,
-                data.get("expectedFiles"))
+                data.get("expectedFiles"),
+                additional_data
+            )
             self.log.info("got {} instance{}".format(
                 len(instances),
                 "s" if len(instances) > 1 else ""))
diff --git a/openpype/modules/sync_server/sync_server.py b/openpype/modules/sync_server/sync_server.py
index aef3623efa..5b873a37cf 100644
--- a/openpype/modules/sync_server/sync_server.py
+++ b/openpype/modules/sync_server/sync_server.py
@@ -50,13 +50,10 @@ async def upload(module, project_name, file, representation, provider_name,
                                                   presets=preset)
 
         file_path = file.get("path", "")
-        try:
-            local_file_path, remote_file_path = resolve_paths(
-                module, file_path, project_name,
-                remote_site_name, remote_handler
-            )
-        except Exception as exp:
-            print(exp)
+        local_file_path, remote_file_path = resolve_paths(
+            module, file_path, project_name,
+            remote_site_name, remote_handler
+        )
 
         target_folder = os.path.dirname(remote_file_path)
         folder_id = remote_handler.create_folder(target_folder)
diff --git a/openpype/modules/sync_server/sync_server_module.py b/openpype/modules/sync_server/sync_server_module.py
index ba0abe7d3b..28863c091a 100644
--- a/openpype/modules/sync_server/sync_server_module.py
+++ b/openpype/modules/sync_server/sync_server_module.py
@@ -3,7 +3,6 @@ import sys
 import time
 from datetime import datetime
 import threading
-import platform
 import copy
 import signal
 from collections import deque, defaultdict
@@ -25,7 +24,11 @@ from openpype.lib import Logger, get_local_site_id
 from openpype.pipeline import AvalonMongoDB, Anatomy
 from openpype.settings.lib import (
     get_default_anatomy_settings,
-    get_anatomy_settings
+    get_anatomy_settings,
+    get_local_settings,
+)
+from openpype.settings.constants import (
+    DEFAULT_PROJECT_KEY
 )
 
 from .providers.local_drive import LocalDriveHandler
@@ -639,6 +642,110 @@ class SyncServerModule(OpenPypeModule, ITrayModule):
             return get_local_site_id()
         return active_site
 
+    def get_active_site_type(self, project_name, local_settings=None):
+        """Active site which is defined by artist.
+
+        Unlike 'get_active_site' is this method also checking local settings
+        where might be different active site set by user. The output is limited
+        to "studio" and "local".
+
+        This method is used by Anatomy when is decided which
+
+        Todos:
+            Check if sync server is enabled for the project.
+            - To be able to do that the sync settings MUST NOT be cached for
+                all projects at once. The sync settings preparation for all
+                projects is reasonable only in sync server loop.
+
+        Args:
+            project_name (str): Name of project where to look for active site.
+            local_settings (Optional[dict[str, Any]]): Prepared local settings.
+
+        Returns:
+            Literal["studio", "local"]: Active site.
+        """
+
+        if not self.enabled:
+            return "studio"
+
+        if local_settings is None:
+            local_settings = get_local_settings()
+
+        local_project_settings = local_settings.get("projects")
+        project_settings = get_project_settings(project_name)
+        sync_server_settings = project_settings["global"]["sync_server"]
+        if not sync_server_settings["enabled"]:
+            return "studio"
+
+        project_active_site = sync_server_settings["config"]["active_site"]
+        if not local_project_settings:
+            return project_active_site
+
+        project_locals = local_project_settings.get(project_name) or {}
+        default_locals = local_project_settings.get(DEFAULT_PROJECT_KEY) or {}
+        active_site = (
+            project_locals.get("active_site")
+            or default_locals.get("active_site")
+        )
+        if active_site:
+            return active_site
+        return project_active_site
+
+    def get_site_root_overrides(
+        self, project_name, site_name, local_settings=None
+    ):
+        """Get root overrides for project on a site.
+
+        Implemented to be used in 'Anatomy' for other than 'studio' site.
+
+        Args:
+            project_name (str): Project for which root overrides should be
+                received.
+            site_name (str): Name of site for which should be received roots.
+            local_settings (Optional[dict[str, Any]]): Prepare local settigns
+                values.
+
+        Returns:
+            Union[dict[str, Any], None]: Root overrides for this machine.
+        """
+
+        # Validate that site name is valid
+        if site_name not in ("studio", "local"):
+            # Considure local site id as 'local'
+            if site_name != get_local_site_id():
+                raise ValueError((
+                    "Root overrides are available only for"
+                    " default sites not for \"{}\""
+                ).format(site_name))
+            site_name = "local"
+
+        if local_settings is None:
+            local_settings = get_local_settings()
+
+        if not local_settings:
+            return
+
+        local_project_settings = local_settings.get("projects") or {}
+
+        # Check for roots existence in local settings first
+        roots_project_locals = (
+            local_project_settings
+            .get(project_name, {})
+        )
+        roots_default_locals = (
+            local_project_settings
+            .get(DEFAULT_PROJECT_KEY, {})
+        )
+
+        # Skip rest of processing if roots are not set
+        if not roots_project_locals and not roots_default_locals:
+            return
+
+        # Combine roots from local settings
+        roots_locals = roots_default_locals.get(site_name) or {}
+        roots_locals.update(roots_project_locals.get(site_name) or {})
+        return roots_locals
+
     # remote sites
     def get_remote_sites(self, project_name):
         """
diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py
index 49d86d69d6..683960f3d8 100644
--- a/openpype/pipeline/anatomy.py
+++ b/openpype/pipeline/anatomy.py
@@ -9,7 +9,6 @@ import six
 import time
 
 from openpype.settings.lib import (
-    get_project_settings,
     get_local_settings,
 )
 from openpype.settings.constants import (
@@ -24,7 +23,7 @@ from openpype.lib.path_templates import (
     FormatObject,
 )
 from openpype.lib.log import Logger
-from openpype.lib import get_local_site_id
+from openpype.modules import ModulesManager
 
 log = Logger.get_logger(__name__)
 
@@ -57,20 +56,13 @@ class BaseAnatomy(object):
     root_key_regex = re.compile(r"{(root?[^}]+)}")
     root_name_regex = re.compile(r"root\[([^]]+)\]")
 
-    def __init__(self, project_doc, local_settings, site_name):
+    def __init__(self, project_doc, root_overrides=None):
         project_name = project_doc["name"]
         self.project_name = project_name
         self.project_code = project_doc["data"]["code"]
 
-        if (site_name and
-                site_name not in ["studio", "local", get_local_site_id()]):
-            raise RuntimeError("Anatomy could be created only for default "
-                               "local sites not for {}".format(site_name))
-
-        self._site_name = site_name
-
         self._data = self._prepare_anatomy_data(
-            project_doc, local_settings, site_name
+            project_doc, root_overrides
         )
         self._templates_obj = AnatomyTemplates(self)
         self._roots_obj = Roots(self)
@@ -92,28 +84,18 @@ class BaseAnatomy(object):
     def items(self):
         return copy.deepcopy(self._data).items()
 
-    def _prepare_anatomy_data(self, project_doc, local_settings, site_name):
+    def _prepare_anatomy_data(self, project_doc, root_overrides):
         """Prepare anatomy data for further processing.
 
         Method added to replace `{task}` with `{task[name]}` in templates.
         """
-        project_name = project_doc["name"]
+
         anatomy_data = self._project_doc_to_anatomy_data(project_doc)
 
-        templates_data = anatomy_data.get("templates")
-        if templates_data:
-            # Replace `{task}` with `{task[name]}` in templates
-            value_queue = collections.deque()
-            value_queue.append(templates_data)
-            while value_queue:
-                item = value_queue.popleft()
-                if not isinstance(item, dict):
-                    continue
-
-        self._apply_local_settings_on_anatomy_data(anatomy_data,
-                                                   local_settings,
-                                                   project_name,
-                                                   site_name)
+        self._apply_local_settings_on_anatomy_data(
+            anatomy_data,
+            root_overrides
+        )
 
         return anatomy_data
 
@@ -347,7 +329,7 @@ class BaseAnatomy(object):
         return output
 
     def _apply_local_settings_on_anatomy_data(
-        self, anatomy_data, local_settings, project_name, site_name
+        self, anatomy_data, root_overrides
     ):
         """Apply local settings on anatomy data.
 
@@ -366,13 +348,138 @@ class BaseAnatomy(object):
 
         Args:
             anatomy_data (dict): Data for anatomy.
-            local_settings (dict): Data of local settings.
-            project_name (str): Name of project for which anatomy data are.
+            root_overrides (dict): Data of local settings.
         """
-        if not local_settings:
+
+        # Skip processing if roots for current active site are not available in
+        #   local settings
+        if not root_overrides:
             return
 
+        current_platform = platform.system().lower()
+
+        root_data = anatomy_data["roots"]
+        for root_name, path in root_overrides.items():
+            if root_name not in root_data:
+                continue
+            anatomy_data["roots"][root_name][current_platform] = (
+                path
+            )
+
+
+class CacheItem:
+    """Helper to cache data.
+
+    Helper does not handle refresh of data and does not mark data as outdated.
+    Who uses the object should check of outdated state on his own will.
+    """
+
+    default_lifetime = 10
+
+    def __init__(self, lifetime=None):
+        self._data = None
+        self._cached = None
+        self._lifetime = lifetime or self.default_lifetime
+
+    @property
+    def data(self):
+        """Cached data/object.
+
+        Returns:
+            Any: Whatever was cached.
+        """
+
+        return self._data
+
+    @property
+    def is_outdated(self):
+        """Item has outdated cache.
+
+        Lifetime of cache item expired or was not yet set.
+
+        Returns:
+            bool: Item is outdated.
+        """
+
+        if self._cached is None:
+            return True
+        return (time.time() - self._cached) > self._lifetime
+
+    def update_data(self, data):
+        """Update cache of data.
+
+        Args:
+            data (Any): Data to cache.
+        """
+
+        self._data = data
+        self._cached = time.time()
+
+
+class Anatomy(BaseAnatomy):
+    _sync_server_addon_cache = CacheItem()
+    _project_cache = collections.defaultdict(CacheItem)
+    _default_site_id_cache = collections.defaultdict(CacheItem)
+    _root_overrides_cache = collections.defaultdict(
+        lambda: collections.defaultdict(CacheItem)
+    )
+
+    def __init__(self, project_name=None, site_name=None):
+        if not project_name:
+            project_name = os.environ.get("AVALON_PROJECT")
+
+        if not project_name:
+            raise ProjectNotSet((
+                "Implementation bug: Project name is not set. Anatomy requires"
+                " to load data for specific project."
+            ))
+
+        project_doc = self.get_project_doc_from_cache(project_name)
+        root_overrides = self._get_site_root_overrides(project_name, site_name)
+
+        super(Anatomy, self).__init__(project_doc, root_overrides)
+
+    @classmethod
+    def get_project_doc_from_cache(cls, project_name):
+        project_cache = cls._project_cache[project_name]
+        if project_cache.is_outdated:
+            project_cache.update_data(get_project(project_name))
+        return copy.deepcopy(project_cache.data)
+
+    @classmethod
+    def get_sync_server_addon(cls):
+        if cls._sync_server_addon_cache.is_outdated:
+            manager = ModulesManager()
+            cls._sync_server_addon_cache.update_data(
+                manager.get_enabled_module("sync_server")
+            )
+        return cls._sync_server_addon_cache.data
+
+    @classmethod
+    def _get_studio_roots_overrides(cls, project_name, local_settings=None):
+        """This would return 'studio' site override by local settings.
+
+        Notes:
+            This logic handles local overrides of studio site which may be
+                available even when sync server is not enabled.
+            Handling of 'studio' and 'local' site was separated as preparation
+                for AYON development where that will be received from
+                separated sources.
+
+        Args:
+            project_name (str): Name of project.
+            local_settings (Optional[dict[str, Any]]): Prepared local settings.
+
+        Returns:
+            Union[Dict[str, str], None]): Local root overrides.
+        """
+
+        if local_settings is None:
+            local_settings = get_local_settings()
+
         local_project_settings = local_settings.get("projects") or {}
+        if not local_project_settings:
+            return None
 
         # Check for roots existence in local settings first
         roots_project_locals = (
@@ -389,106 +496,59 @@ class BaseAnatomy(object):
             return
 
         # Combine roots from local settings
-        roots_locals = roots_default_locals.get(site_name) or {}
-        roots_locals.update(roots_project_locals.get(site_name) or {})
-        # Skip processing if roots for current active site are not available in
-        #   local settings
-        if not roots_locals:
-            return
-
-        current_platform = platform.system().lower()
-
-        root_data = anatomy_data["roots"]
-        for root_name, path in roots_locals.items():
-            if root_name not in root_data:
-                continue
-            anatomy_data["roots"][root_name][current_platform] = (
-                path
-            )
-
-
-class Anatomy(BaseAnatomy):
-    _project_cache = {}
-    _site_cache = {}
-
-    def __init__(self, project_name=None, site_name=None):
-        if not project_name:
-            project_name = os.environ.get("AVALON_PROJECT")
-
-        if not project_name:
-            raise ProjectNotSet((
-                "Implementation bug: Project name is not set. Anatomy requires"
-                " to load data for specific project."
-            ))
-
-        project_doc = self.get_project_doc_from_cache(project_name)
-        local_settings = get_local_settings()
-        if not site_name:
-            site_name = self.get_site_name_from_cache(
-                project_name, local_settings
-            )
-
-        super(Anatomy, self).__init__(
-            project_doc,
-            local_settings,
-            site_name
-        )
+        roots_locals = roots_default_locals.get("studio") or {}
+        roots_locals.update(roots_project_locals.get("studio") or {})
+        return roots_locals
 
     @classmethod
-    def get_project_doc_from_cache(cls, project_name):
-        project_cache = cls._project_cache.get(project_name)
-        if project_cache is not None:
-            if time.time() - project_cache["start"] > 10:
-                cls._project_cache.pop(project_name)
-                project_cache = None
+    def _get_site_root_overrides(cls, project_name, site_name):
+        """Get root overrides for site.
 
-        if project_cache is None:
-            project_cache = {
-                "project_doc": get_project(project_name),
-                "start": time.time()
-            }
-            cls._project_cache[project_name] = project_cache
+        Args:
+            project_name (str): Project name for which root overrides should be
+                received.
+            site_name (Union[str, None]): Name of site for which root overrides
+                should be returned.
+        """
 
-        return copy.deepcopy(
-            cls._project_cache[project_name]["project_doc"]
-        )
+        # Local settings may be used more than once or may not be used at all
+        # - to avoid slowdowns 'get_local_settings' is not called until it's
+        #   really needed
+        local_settings = None
 
-    @classmethod
-    def get_site_name_from_cache(cls, project_name, local_settings):
-        site_cache = cls._site_cache.get(project_name)
-        if site_cache is not None:
-            if time.time() - site_cache["start"] > 10:
-                cls._site_cache.pop(project_name)
-                site_cache = None
+        # First check if sync server is available and enabled
+        sync_server = cls.get_sync_server_addon()
+        if sync_server is None or not sync_server.enabled:
+            # QUESTION is ok to force 'studio' when site sync is not enabled?
+            site_name = "studio"
 
-        if site_cache:
-            return site_cache["site_name"]
+        elif not site_name:
+            # Use sync server to receive active site name
+            project_cache = cls._default_site_id_cache[project_name]
+            if project_cache.is_outdated:
+                local_settings = get_local_settings()
+                project_cache.update_data(
+                    sync_server.get_active_site_type(
+                        project_name, local_settings
+                    )
+                )
+            site_name = project_cache.data
 
-        local_project_settings = local_settings.get("projects")
-        if not local_project_settings:
-            return
-
-        project_locals = local_project_settings.get(project_name) or {}
-        default_locals = local_project_settings.get(DEFAULT_PROJECT_KEY) or {}
-        active_site = (
-            project_locals.get("active_site")
-            or default_locals.get("active_site")
-        )
-        if not active_site:
-            project_settings = get_project_settings(project_name)
-            active_site = (
-                project_settings
-                ["global"]
-                ["sync_server"]
-                ["config"]
-                ["active_site"]
-            )
-
-        cls._site_cache[project_name] = {
-            "site_name": active_site,
-            "start": time.time()
-        }
-        return active_site
+        site_cache = cls._root_overrides_cache[project_name][site_name]
+        if site_cache.is_outdated:
+            if site_name == "studio":
+                # Handle studio root overrides without sync server
+                # - studio root overrides can be done even without sync server
+                roots_overrides = cls._get_studio_roots_overrides(
+                    project_name, local_settings
+                )
+            else:
+                # Ask sync server to get roots overrides
+                roots_overrides = sync_server.get_site_root_overrides(
+                    project_name, site_name, local_settings
+                )
+            site_cache.update_data(roots_overrides)
+        return site_cache.data
 
 
 class AnatomyTemplateUnsolved(TemplateUnsolved):
diff --git a/openpype/pipeline/colorspace.py b/openpype/pipeline/colorspace.py
index cb37b2c4ae..6f68bdc5bf 100644
--- a/openpype/pipeline/colorspace.py
+++ b/openpype/pipeline/colorspace.py
@@ -198,41 +198,19 @@ def validate_imageio_colorspace_in_config(config_path, colorspace_name):
     return True
 
 
-def get_ocio_config_colorspaces(config_path):
-    """Get all colorspace data
-
-    Wrapper function for aggregating all names and its families.
-    Families can be used for building menu and submenus in gui.
-
-    Args:
-        config_path (str): path leading to config.ocio file
-
-    Returns:
-        dict: colorspace and family in couple
-    """
-    if sys.version_info[0] == 2:
-        return get_colorspace_data_subprocess(config_path)
-
-    from ..scripts.ocio_wrapper import _get_colorspace_data
-    return _get_colorspace_data(config_path)
-
-
-def get_colorspace_data_subprocess(config_path):
-    """Get colorspace data via subprocess
+def get_data_subprocess(config_path, data_type):
+    """Get data via subprocess
 
     Wrapper for Python 2 hosts.
 
     Args:
         config_path (str): path leading to config.ocio file
-
-    Returns:
-        dict: colorspace and family in couple
     """
     with _make_temp_json_file() as tmp_json_path:
         # Prepare subprocess arguments
         args = [
             "run", get_ocio_config_script_path(),
-            "config", "get_colorspace",
+            "config", data_type,
             "--in_path", config_path,
             "--out_path", tmp_json_path
 
@@ -251,6 +229,47 @@ def get_colorspace_data_subprocess(config_path):
         return json.loads(return_json_data)
 
 
+def compatible_python():
+    """Only 3.9 or higher can directly use PyOpenColorIO in ocio_wrapper"""
+    compatible = False
+    if sys.version[0] == 3 and sys.version[1] >= 9:
+        compatible = True
+    return compatible
+
+
+def get_ocio_config_colorspaces(config_path):
+    """Get all colorspace data
+
+    Wrapper function for aggregating all names and its families.
+    Families can be used for building menu and submenus in gui.
+
+    Args:
+        config_path (str): path leading to config.ocio file
+
+    Returns:
+        dict: colorspace and family in couple
+    """
+    if compatible_python():
+        from ..scripts.ocio_wrapper import _get_colorspace_data
+        return _get_colorspace_data(config_path)
+    else:
+        return get_colorspace_data_subprocess(config_path)
+
+
+def get_colorspace_data_subprocess(config_path):
+    """Get colorspace data via subprocess
+
+    Wrapper for Python 2 hosts.
+
+    Args:
+        config_path (str): path leading to config.ocio file
+
+    Returns:
+        dict: colorspace and family in couple
+    """
+    return get_data_subprocess(config_path, "get_colorspace")
+
+
 def get_ocio_config_views(config_path):
     """Get all viewer data
 
@@ -263,12 +282,12 @@ def get_ocio_config_views(config_path):
     Returns:
         dict: `display/viewer` and viewer data
     """
-    if sys.version_info[0] == 2:
+    if compatible_python():
+        from ..scripts.ocio_wrapper import _get_views_data
+        return _get_views_data(config_path)
+    else:
         return get_views_data_subprocess(config_path)
 
-    from ..scripts.ocio_wrapper import _get_views_data
-    return _get_views_data(config_path)
-
 
 def get_views_data_subprocess(config_path):
     """Get viewers data via subprocess
@@ -281,27 +300,7 @@ def get_views_data_subprocess(config_path):
     Returns:
         dict: `display/viewer` and viewer data
     """
-    with _make_temp_json_file() as tmp_json_path:
-        # Prepare subprocess arguments
-        args = [
-            "run", get_ocio_config_script_path(),
-            "config", "get_views",
-            "--in_path", config_path,
-            "--out_path", tmp_json_path
-
-        ]
-        log.info("Executing: {}".format(" ".join(args)))
-
-        process_kwargs = {
-            "logger": log,
-            "env": {}
-        }
-
-        run_openpype_process(*args, **process_kwargs)
-
-        # return all colorspaces
-        return_json_data = open(tmp_json_path).read()
-        return json.loads(return_json_data)
+    return get_data_subprocess(config_path, "get_views")
 
 
 def get_imageio_config(
diff --git a/openpype/scripts/ocio_wrapper.py b/openpype/scripts/ocio_wrapper.py
index 0685b2e52a..16558642c6 100644
--- a/openpype/scripts/ocio_wrapper.py
+++ b/openpype/scripts/ocio_wrapper.py
@@ -157,11 +157,21 @@ def _get_views_data(config_path):
 
     config = ocio.Config().CreateFromFile(str(config_path))
 
-    return {
-        f"{d}/{v}": {"display": d, "view": v}
-        for d in config.getDisplays()
-        for v in config.getViews(d)
-    }
+    data = {}
+    for display in config.getDisplays():
+        for view in config.getViews(display):
+            colorspace = config.getDisplayViewColorSpaceName(display, view)
+            # Special token. See https://opencolorio.readthedocs.io/en/latest/guides/authoring/authoring.html#shared-views # noqa
+            if colorspace == "<USE_DISPLAY_NAME>":
+                colorspace = display
+
+            data[f"{display}/{view}"] = {
+                "display": display,
+                "view": view,
+                "colorspace": colorspace
+            }
+
+    return data
 
 
 if __name__ == '__main__':
diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json
index 99a869963b..02c0e35377 100644
--- a/openpype/settings/defaults/project_anatomy/templates.json
+++ b/openpype/settings/defaults/project_anatomy/templates.json
@@ -55,7 +55,7 @@
         },
         "source": {
             "folder": "{root[work]}/{originalDirname}",
-            "file": "{originalBasename}<.{@frame}><_{udim}>.{ext}",
+            "file": "{originalBasename}.{ext}",
             "path": "{@folder}/{@file}"
         },
         "__dynamic_keys_labels__": {
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 32b141566b..2559448900 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -147,6 +147,7 @@
             "enabled": true,
             "write_color_sets": false,
             "write_face_sets": false,
+            "include_user_defined_attributes": false,
             "defaults": [
                 "Main"
             ]
@@ -165,6 +166,7 @@
             "enabled": true,
             "write_color_sets": false,
             "write_face_sets": false,
+            "include_user_defined_attributes": false,
             "defaults": [
                 "Main"
             ]
diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json
index e06a67a254..9173a8c3d5 100644
--- a/openpype/settings/defaults/project_settings/tvpaint.json
+++ b/openpype/settings/defaults/project_settings/tvpaint.json
@@ -31,13 +31,13 @@
             "default_variants": []
         },
         "create_render_layer": {
-            "mark_for_review": true,
+            "mark_for_review": false,
             "default_pass_name": "beauty",
             "default_variant": "Main",
             "default_variants": []
         },
         "create_render_pass": {
-            "mark_for_review": true,
+            "mark_for_review": false,
             "default_variant": "Main",
             "default_variants": []
         },
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
index e1a3082616..77a39f692f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
@@ -132,6 +132,11 @@
                     "key": "write_face_sets",
                     "label": "Write Face Sets"
                 },
+                {
+                    "type": "boolean",
+                    "key": "include_user_defined_attributes",
+                    "label": "Include User Defined Attributes"
+                },
                 {
                     "type": "list",
                     "key": "defaults",
@@ -192,6 +197,11 @@
                     "key": "write_face_sets",
                     "label": "Write Face Sets"
                 },
+                {
+                    "type": "boolean",
+                    "key": "include_user_defined_attributes",
+                    "label": "Include User Defined Attributes"
+                },
                 {
                     "type": "list",
                     "key": "defaults",
diff --git a/openpype/settings/handlers.py b/openpype/settings/handlers.py
index 373029d9df..a1f3331ccc 100644
--- a/openpype/settings/handlers.py
+++ b/openpype/settings/handlers.py
@@ -9,6 +9,7 @@ import six
 import openpype.version
 from openpype.client.mongo import OpenPypeMongoConnection
 from openpype.client.entities import get_project_connection, get_project
+from openpype.lib.pype_info import get_workstation_info
 
 from .constants import (
     GLOBAL_SETTINGS_KEY,
@@ -235,6 +236,18 @@ class SettingsHandler(object):
         """
         pass
 
+    @abstractmethod
+    def save_change_log(self, project_name, changes, settings_type):
+        """Stores changes to settings to separate logging collection.
+
+        Args:
+            project_name(str, null): Project name for which overrides are
+                or None for global settings.
+            changes(dict): Data of project overrides with override metadata.
+            settings_type (str): system|project|anatomy
+        """
+        pass
+
     @abstractmethod
     def get_studio_system_settings_overrides(self, return_version):
         """Studio overrides of system settings."""
@@ -913,6 +926,32 @@ class MongoSettingsHandler(SettingsHandler):
 
         return data
 
+    def save_change_log(self, project_name, changes, settings_type):
+        """Log all settings changes to separate collection"""
+        if not changes:
+            return
+
+        if settings_type == "project" and not project_name:
+            project_name = "default"
+
+        host_info = get_workstation_info()
+
+        document = {
+            "local_id": host_info["local_id"],
+            "username": host_info["username"],
+            "hostname": host_info["hostname"],
+            "hostip": host_info["hostip"],
+            "system_name": host_info["system_name"],
+            "date_created": datetime.datetime.now(),
+            "project": project_name,
+            "settings_type": settings_type,
+            "changes": changes
+        }
+        collection_name = "settings_log"
+        collection = (self.settings_collection[self.database_name]
+                                              [collection_name])
+        collection.insert_one(document)
+
     def _save_project_anatomy_data(self, project_name, data_cache):
         # Create copy of data as they will be modified during save
         new_data = data_cache.data_copy()
diff --git a/openpype/settings/lib.py b/openpype/settings/lib.py
index 796eaeda01..73554df236 100644
--- a/openpype/settings/lib.py
+++ b/openpype/settings/lib.py
@@ -159,6 +159,7 @@ def save_studio_settings(data):
             except SaveWarningExc as exc:
                 warnings.extend(exc.warnings)
 
+    _SETTINGS_HANDLER.save_change_log(None, changes, "system")
     _SETTINGS_HANDLER.save_studio_settings(data)
     if warnings:
         raise SaveWarningExc(warnings)
@@ -218,7 +219,7 @@ def save_project_settings(project_name, overrides):
                 )
             except SaveWarningExc as exc:
                 warnings.extend(exc.warnings)
-
+    _SETTINGS_HANDLER.save_change_log(project_name, changes, "project")
     _SETTINGS_HANDLER.save_project_settings(project_name, overrides)
 
     if warnings:
@@ -280,6 +281,7 @@ def save_project_anatomy(project_name, anatomy_data):
             except SaveWarningExc as exc:
                 warnings.extend(exc.warnings)
 
+    _SETTINGS_HANDLER.save_change_log(project_name, changes, "anatomy")
     _SETTINGS_HANDLER.save_project_anatomy(project_name, anatomy_data)
 
     if warnings:
diff --git a/openpype/tools/sceneinventory/switch_dialog.py b/openpype/tools/sceneinventory/switch_dialog.py
index 47baeaebea..4aaad38bbc 100644
--- a/openpype/tools/sceneinventory/switch_dialog.py
+++ b/openpype/tools/sceneinventory/switch_dialog.py
@@ -2,7 +2,6 @@ import collections
 import logging
 from qtpy import QtWidgets, QtCore
 import qtawesome
-from bson.objectid import ObjectId
 
 from openpype.client import (
     get_asset_by_name,
@@ -161,7 +160,7 @@ class SwitchAssetDialog(QtWidgets.QDialog):
         repre_ids = set()
         content_loaders = set()
         for item in self._items:
-            repre_ids.add(ObjectId(item["representation"]))
+            repre_ids.add(str(item["representation"]))
             content_loaders.add(item["loader"])
 
         project_name = self.active_project()
@@ -170,7 +169,7 @@ class SwitchAssetDialog(QtWidgets.QDialog):
             representation_ids=repre_ids,
             archived=True
         ))
-        repres_by_id = {repre["_id"]: repre for repre in repres}
+        repres_by_id = {str(repre["_id"]): repre for repre in repres}
 
         # stash context values, works only for single representation
         if len(repres) == 1:
@@ -181,22 +180,22 @@ class SwitchAssetDialog(QtWidgets.QDialog):
         content_repres = {}
         archived_repres = []
         missing_repres = []
-        version_ids = []
+        version_ids = set()
         for repre_id in repre_ids:
             if repre_id not in repres_by_id:
                 missing_repres.append(repre_id)
             elif repres_by_id[repre_id]["type"] == "archived_representation":
                 repre = repres_by_id[repre_id]
                 archived_repres.append(repre)
-                version_ids.append(repre["parent"])
+                version_ids.add(repre["parent"])
             else:
                 repre = repres_by_id[repre_id]
                 content_repres[repre_id] = repres_by_id[repre_id]
-                version_ids.append(repre["parent"])
+                version_ids.add(repre["parent"])
 
         versions = get_versions(
             project_name,
-            version_ids=set(version_ids),
+            version_ids=version_ids,
             hero=True
         )
         content_versions = {}
@@ -1249,7 +1248,7 @@ class SwitchAssetDialog(QtWidgets.QDialog):
             repre_docs_by_parent_id_by_name[parent_id][name] = repre_doc
 
         for container in self._items:
-            container_repre_id = ObjectId(container["representation"])
+            container_repre_id = container["representation"]
             container_repre = self.content_repres[container_repre_id]
             container_repre_name = container_repre["name"]
 
diff --git a/openpype/tools/sceneinventory/view.py b/openpype/tools/sceneinventory/view.py
index 3c4e03a195..a04171e429 100644
--- a/openpype/tools/sceneinventory/view.py
+++ b/openpype/tools/sceneinventory/view.py
@@ -4,7 +4,6 @@ from functools import partial
 
 from qtpy import QtWidgets, QtCore
 import qtawesome
-from bson.objectid import ObjectId
 
 from openpype.client import (
     get_version_by_id,
@@ -84,22 +83,20 @@ class SceneInventoryView(QtWidgets.QTreeView):
         if not items:
             return
 
-        repre_ids = []
-        for item in items:
-            item_id = ObjectId(item["representation"])
-            if item_id not in repre_ids:
-                repre_ids.append(item_id)
+        repre_ids = {
+            item["representation"]
+            for item in items
+        }
 
         project_name = legacy_io.active_project()
         repre_docs = get_representations(
             project_name, representation_ids=repre_ids, fields=["parent"]
         )
 
-        version_ids = []
-        for repre_doc in repre_docs:
-            version_id = repre_doc["parent"]
-            if version_id not in version_ids:
-                version_ids.append(version_id)
+        version_ids = {
+            repre_doc["parent"]
+            for repre_doc in repre_docs
+        }
 
         loaded_versions = get_versions(
             project_name, version_ids=version_ids, hero=True
@@ -107,18 +104,17 @@ class SceneInventoryView(QtWidgets.QTreeView):
 
         loaded_hero_versions = []
         versions_by_parent_id = collections.defaultdict(list)
-        version_parents = []
+        subset_ids = set()
         for version in loaded_versions:
             if version["type"] == "hero_version":
                 loaded_hero_versions.append(version)
             else:
                 parent_id = version["parent"]
                 versions_by_parent_id[parent_id].append(version)
-                if parent_id not in version_parents:
-                    version_parents.append(parent_id)
+                subset_ids.add(parent_id)
 
         all_versions = get_versions(
-            project_name, subset_ids=version_parents, hero=True
+            project_name, subset_ids=subset_ids, hero=True
         )
         hero_versions = []
         versions = []
@@ -146,11 +142,10 @@ class SceneInventoryView(QtWidgets.QTreeView):
         switch_to_versioned = None
         if has_loaded_hero_versions:
             def _on_switch_to_versioned(items):
-                repre_ids = []
-                for item in items:
-                    item_id = ObjectId(item["representation"])
-                    if item_id not in repre_ids:
-                        repre_ids.append(item_id)
+                repre_ids = {
+                    item["representation"]
+                    for item in items
+                }
 
                 repre_docs = get_representations(
                     project_name,
@@ -158,13 +153,13 @@ class SceneInventoryView(QtWidgets.QTreeView):
                     fields=["parent"]
                 )
 
-                version_ids = []
+                version_ids = set()
                 version_id_by_repre_id = {}
                 for repre_doc in repre_docs:
                     version_id = repre_doc["parent"]
-                    version_id_by_repre_id[repre_doc["_id"]] = version_id
-                    if version_id not in version_ids:
-                        version_ids.append(version_id)
+                    repre_id = str(repre_doc["_id"])
+                    version_id_by_repre_id[repre_id] = version_id
+                    version_ids.add(version_id)
 
                 hero_versions = get_hero_versions(
                     project_name,
@@ -172,10 +167,10 @@ class SceneInventoryView(QtWidgets.QTreeView):
                     fields=["version_id"]
                 )
 
-                version_ids = set()
+                hero_src_version_ids = set()
                 for hero_version in hero_versions:
                     version_id = hero_version["version_id"]
-                    version_ids.add(version_id)
+                    hero_src_version_ids.add(version_id)
                     hero_version_id = hero_version["_id"]
                     for _repre_id, current_version_id in (
                         version_id_by_repre_id.items()
@@ -185,7 +180,7 @@ class SceneInventoryView(QtWidgets.QTreeView):
 
                 version_docs = get_versions(
                     project_name,
-                    version_ids=version_ids,
+                    version_ids=hero_src_version_ids,
                     fields=["name"]
                 )
                 version_name_by_id = {}
@@ -194,7 +189,7 @@ class SceneInventoryView(QtWidgets.QTreeView):
                         version_doc["name"]
 
                 for item in items:
-                    repre_id = ObjectId(item["representation"])
+                    repre_id = item["representation"]
                     version_id = version_id_by_repre_id.get(repre_id)
                     version_name = version_name_by_id.get(version_id)
                     if version_name is not None:
diff --git a/openpype/version.py b/openpype/version.py
index bb5171764c..bd1ba5309d 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.15.2-nightly.1"
+__version__ = "3.15.2-nightly.2"
diff --git a/website/docs/artist_hosts_maya.md b/website/docs/artist_hosts_maya.md
index 9fab845e62..07495fbc96 100644
--- a/website/docs/artist_hosts_maya.md
+++ b/website/docs/artist_hosts_maya.md
@@ -314,10 +314,19 @@ Example setup:
 
 ![Maya - Point Cache Example](assets/maya-pointcache_setup.png)
 
-:::note Publish on farm
-If your studio has Deadline configured, artists could choose to offload potentially long running export of pointache and publish it to the farm.
-Only thing that is necessary is to toggle `Farm` property in created pointcache instance to True.
-:::
+#### Options
+
+- **Frame Start**: which frame to start the export at.
+- **Frame End**: which frame to end the export at.
+- **Handle Start**: additional frames to export at frame start. Ei. frame start - handle start = export start.
+- **Handle Start**: additional frames to export at frame end. Ei. frame end + handle end = export end.
+- **Step**: frequency of sampling the export. For example when dealing with quick movements for motion blur, a step size of less than 1 might be better.
+- **Refresh**: refresh the viewport when exporting the pointcache. For performance is best to leave off, but certain situations can require to refresh the viewport, for example using the Bullet plugin.
+- **Attr**: specific attributes to publish separated by `;`.
+- **AttrPrefix**: specific attributes which start with this prefix to publish separated by `;`.
+- **Include User Defined Attribudes**: include all user defined attributes in the publish.
+- **Farm**: if your studio has Deadline configured, artists could choose to offload potentially long running export of pointache and publish it to the farm. Only thing that is necessary is to toggle this attribute in created pointcache instance to True.
+- **Priority**: Farm priority.
 
 ### Loading Point Caches