diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3c7820d8f..f20276cbd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,28 @@
 # Changelog
 
-## [3.9.1](https://github.com/pypeclub/OpenPype/tree/3.9.1) (2022-03-17)
+## [3.9.2-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
-[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.9.0...3.9.1)
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.9.1...HEAD)
+
+**🚀 Enhancements**
+
+- CI: change the version bump logic [\#2919](https://github.com/pypeclub/OpenPype/pull/2919)
+- Deadline: Add headless argument [\#2916](https://github.com/pypeclub/OpenPype/pull/2916)
+- Ftrack: Fill workfile in custom attribute [\#2906](https://github.com/pypeclub/OpenPype/pull/2906)
+- Settings UI: Add simple tooltips for settings entities [\#2901](https://github.com/pypeclub/OpenPype/pull/2901)
+
+**🐛 Bug fixes**
+
+- Ftrack: Missing Ftrack id after editorial publish [\#2905](https://github.com/pypeclub/OpenPype/pull/2905)
+- AfterEffects: Fix rendering for single frame in DL [\#2875](https://github.com/pypeclub/OpenPype/pull/2875)
+
+**🔀 Refactored code**
+
+- General: Move formatting and workfile functions [\#2914](https://github.com/pypeclub/OpenPype/pull/2914)
+
+## [3.9.1](https://github.com/pypeclub/OpenPype/tree/3.9.1) (2022-03-18)
+
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.9.1-nightly.3...3.9.1)
 
 **🚀 Enhancements**
 
@@ -22,7 +42,6 @@
 - General: Remove forgotten use of avalon Creator [\#2885](https://github.com/pypeclub/OpenPype/pull/2885)
 - General: Avoid circular import [\#2884](https://github.com/pypeclub/OpenPype/pull/2884)
 - Fixes for attaching loaded containers \(\#2837\) [\#2874](https://github.com/pypeclub/OpenPype/pull/2874)
-- Maya: Deformer node ids validation plugin [\#2826](https://github.com/pypeclub/OpenPype/pull/2826)
 
 **🔀 Refactored code**
 
@@ -75,6 +94,7 @@
 - Maya: Stop creation of reviews for Cryptomattes [\#2832](https://github.com/pypeclub/OpenPype/pull/2832)
 - Deadline: Remove recreated event [\#2828](https://github.com/pypeclub/OpenPype/pull/2828)
 - Deadline: Added missing events folder [\#2827](https://github.com/pypeclub/OpenPype/pull/2827)
+- Maya: Deformer node ids validation plugin [\#2826](https://github.com/pypeclub/OpenPype/pull/2826)
 - Settings: Missing document with OP versions may break start of OpenPype [\#2825](https://github.com/pypeclub/OpenPype/pull/2825)
 - Deadline: more detailed temp file name for environment json [\#2824](https://github.com/pypeclub/OpenPype/pull/2824)
 - General: Host name was formed from obsolete code [\#2821](https://github.com/pypeclub/OpenPype/pull/2821)
@@ -92,7 +112,6 @@
 - General: Move change context functions [\#2839](https://github.com/pypeclub/OpenPype/pull/2839)
 - Tools: Don't use avalon tools code [\#2829](https://github.com/pypeclub/OpenPype/pull/2829)
 - Move Unreal Implementation to OpenPype [\#2823](https://github.com/pypeclub/OpenPype/pull/2823)
-- General: Extract template formatting from anatomy [\#2766](https://github.com/pypeclub/OpenPype/pull/2766)
 
 ## [3.8.2](https://github.com/pypeclub/OpenPype/tree/3.8.2) (2022-02-07)
 
diff --git a/openpype/hosts/hiero/api/events.py b/openpype/hosts/hiero/api/events.py
index 9439199933..7fab3edfc8 100644
--- a/openpype/hosts/hiero/api/events.py
+++ b/openpype/hosts/hiero/api/events.py
@@ -1,12 +1,12 @@
 import os
 import hiero.core.events
 from openpype.api import Logger
+from openpype.lib import register_event_callback
 from .lib import (
     sync_avalon_data_to_workfile,
     launch_workfiles_app,
     selection_changed_timeline,
     before_project_save,
-    register_event_callback
 )
 from .tags import add_tags_to_workfile
 from .menu import update_menu_task_label
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_texture.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_texture.py
index ea0b6cdf41..c1c48ec72d 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_texture.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_texture.py
@@ -3,9 +3,10 @@ import re
 import pyblish.api
 import json
 
-from avalon.api import format_template_with_optional_keys
-
-from openpype.lib import prepare_template_data
+from openpype.lib import (
+    prepare_template_data,
+    StringTemplate,
+)
 
 
 class CollectTextures(pyblish.api.ContextPlugin):
@@ -110,8 +111,9 @@ class CollectTextures(pyblish.api.ContextPlugin):
 
                     formatting_data.update(explicit_data)
                     fill_pairs = prepare_template_data(formatting_data)
-                    workfile_subset = format_template_with_optional_keys(
-                        fill_pairs, self.workfile_subset_template)
+                    workfile_subset = StringTemplate.format_strict_template(
+                        self.workfile_subset_template, fill_pairs
+                    )
 
                     asset_build = self._get_asset_build(
                         repre_file,
@@ -201,8 +203,9 @@ class CollectTextures(pyblish.api.ContextPlugin):
                     formatting_data.update(explicit_data)
 
                     fill_pairs = prepare_template_data(formatting_data)
-                    subset = format_template_with_optional_keys(
-                        fill_pairs, self.texture_subset_template)
+                    subset = StringTemplate.format_strict_template(
+                        self.texture_subset_template, fill_pairs
+                    )
 
                     asset_build = self._get_asset_build(
                         repre_file,
diff --git a/openpype/hosts/tvpaint/plugins/load/load_workfile.py b/openpype/hosts/tvpaint/plugins/load/load_workfile.py
index 33e2a76cc9..d224cfc390 100644
--- a/openpype/hosts/tvpaint/plugins/load/load_workfile.py
+++ b/openpype/hosts/tvpaint/plugins/load/load_workfile.py
@@ -1,10 +1,11 @@
-import getpass
 import os
 
 from avalon import api, io
 from openpype.lib import (
+    StringTemplate,
     get_workfile_template_key_from_context,
-    get_workdir_data
+    get_workdir_data,
+    get_last_workfile_with_version,
 )
 from openpype.api import Anatomy
 from openpype.hosts.tvpaint.api import lib, pipeline, plugin
@@ -67,9 +68,8 @@ class LoadWorkfile(plugin.Loader):
 
         data = get_workdir_data(project_doc, asset_doc, task_name, host_name)
         data["root"] = anatomy.roots
-        data["user"] = getpass.getuser()
 
-        template = anatomy.templates[template_key]["file"]
+        file_template = anatomy.templates[template_key]["file"]
 
         # Define saving file extension
         if current_file:
@@ -81,11 +81,12 @@ class LoadWorkfile(plugin.Loader):
 
         data["ext"] = extension
 
-        work_root = api.format_template_with_optional_keys(
-            data, anatomy.templates[template_key]["folder"]
+        folder_template = anatomy.templates[template_key]["folder"]
+        work_root = StringTemplate.format_strict_template(
+            folder_template, data
         )
-        version = api.last_workfile_with_version(
-            work_root, template, data, host.file_extensions()
+        version = get_last_workfile_with_version(
+            work_root, file_template, data, host.file_extensions()
         )[1]
 
         if version is None:
@@ -95,8 +96,8 @@ class LoadWorkfile(plugin.Loader):
 
         data["version"] = version
 
-        path = os.path.join(
-            work_root,
-            api.format_template_with_optional_keys(data, template)
+        filename = StringTemplate.format_strict_template(
+            file_template, data
         )
+        path = os.path.join(work_root, filename)
         host.save_file(path)
diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py
index b8502ae718..1ebafbb2d2 100644
--- a/openpype/lib/__init__.py
+++ b/openpype/lib/__init__.py
@@ -114,6 +114,8 @@ from .avalon_context import (
     get_workdir_data,
     get_workdir,
     get_workdir_with_workdir_data,
+    get_last_workfile_with_version,
+    get_last_workfile,
 
     create_workfile_doc,
     save_workfile_data_to_doc,
@@ -263,6 +265,8 @@ __all__ = [
     "get_workdir_data",
     "get_workdir",
     "get_workdir_with_workdir_data",
+    "get_last_workfile_with_version",
+    "get_last_workfile",
 
     "create_workfile_doc",
     "save_workfile_data_to_doc",
diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index a7621be2b5..e72585c75a 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -28,7 +28,8 @@ from .local_settings import get_openpype_username
 from .avalon_context import (
     get_workdir_data,
     get_workdir_with_workdir_data,
-    get_workfile_template_key
+    get_workfile_template_key,
+    get_last_workfile
 )
 
 from .python_module_tools import (
@@ -1610,7 +1611,7 @@ def _prepare_last_workfile(data, workdir):
                 "ext": extensions[0]
             })
 
-            last_workfile_path = avalon.api.last_workfile(
+            last_workfile_path = get_last_workfile(
                 workdir, file_template, workdir_data, extensions, True
             )
 
diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index e16d14dd16..05d2ffd821 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -18,6 +18,7 @@ from openpype.settings import (
 from .anatomy import Anatomy
 from .profiles_filtering import filter_profiles
 from .events import emit_event
+from .path_templates import StringTemplate
 
 # avalon module is not imported at the top
 # - may not be in path at the time of pype.lib initialization
@@ -1737,8 +1738,6 @@ def get_custom_workfile_template_by_context(
             context. (Existence of formatted path is not validated.)
     """
 
-    from openpype.lib import filter_profiles
-
     if anatomy is None:
         anatomy = Anatomy(project_doc["name"])
 
@@ -1761,7 +1760,9 @@ def get_custom_workfile_template_by_context(
     # there are some anatomy template strings
     if matching_item:
         template = matching_item["path"][platform.system().lower()]
-        return template.format(**anatomy_context_data)
+        return StringTemplate.format_strict_template(
+            template, anatomy_context_data
+        )
 
     return None
 
@@ -1849,3 +1850,124 @@ def get_custom_workfile_template(template_profiles):
         io.Session["AVALON_TASK"],
         io
     )
+
+
+def get_last_workfile_with_version(
+    workdir, file_template, fill_data, extensions
+):
+    """Return last workfile version.
+
+    Args:
+        workdir(str): Path to dir where workfiles are stored.
+        file_template(str): Template of file name.
+        fill_data(dict): Data for filling template.
+        extensions(list, tuple): All allowed file extensions of workfile.
+
+    Returns:
+        tuple: Last workfile<str> with version<int> if there is any otherwise
+            returns (None, None).
+    """
+    if not os.path.exists(workdir):
+        return None, None
+
+    # Fast match on extension
+    filenames = [
+        filename
+        for filename in os.listdir(workdir)
+        if os.path.splitext(filename)[1] in extensions
+    ]
+
+    # Build template without optionals, version to digits only regex
+    # and comment to any definable value.
+    _ext = []
+    for ext in extensions:
+        if not ext.startswith("."):
+            ext = "." + ext
+        # Escape dot for regex
+        ext = "\\" + ext
+        _ext.append(ext)
+    ext_expression = "(?:" + "|".join(_ext) + ")"
+
+    # Replace `.{ext}` with `{ext}` so we are sure there is not dot at the end
+    file_template = re.sub(r"\.?{ext}", ext_expression, file_template)
+    # Replace optional keys with optional content regex
+    file_template = re.sub(r"<.*?>", r".*?", file_template)
+    # Replace `{version}` with group regex
+    file_template = re.sub(r"{version.*?}", r"([0-9]+)", file_template)
+    file_template = re.sub(r"{comment.*?}", r".+?", file_template)
+    file_template = StringTemplate.format_strict_template(
+        file_template, fill_data
+    )
+
+    # Match with ignore case on Windows due to the Windows
+    # OS not being case-sensitive. This avoids later running
+    # into the error that the file did exist if it existed
+    # with a different upper/lower-case.
+    kwargs = {}
+    if platform.system().lower() == "windows":
+        kwargs["flags"] = re.IGNORECASE
+
+    # Get highest version among existing matching files
+    version = None
+    output_filenames = []
+    for filename in sorted(filenames):
+        match = re.match(file_template, filename, **kwargs)
+        if not match:
+            continue
+
+        file_version = int(match.group(1))
+        if version is None or file_version > version:
+            output_filenames[:] = []
+            version = file_version
+
+        if file_version == version:
+            output_filenames.append(filename)
+
+    output_filename = None
+    if output_filenames:
+        if len(output_filenames) == 1:
+            output_filename = output_filenames[0]
+        else:
+            last_time = None
+            for _output_filename in output_filenames:
+                full_path = os.path.join(workdir, _output_filename)
+                mod_time = os.path.getmtime(full_path)
+                if last_time is None or last_time < mod_time:
+                    output_filename = _output_filename
+                    last_time = mod_time
+
+    return output_filename, version
+
+
+def get_last_workfile(
+    workdir, file_template, fill_data, extensions, full_path=False
+):
+    """Return last workfile filename.
+
+    Returns file with version 1 if there is not workfile yet.
+
+    Args:
+        workdir(str): Path to dir where workfiles are stored.
+        file_template(str): Template of file name.
+        fill_data(dict): Data for filling template.
+        extensions(list, tuple): All allowed file extensions of workfile.
+        full_path(bool): Full path to file is returned if set to True.
+
+    Returns:
+        str: Last or first workfile as filename of full path to filename.
+    """
+    filename, version = get_last_workfile_with_version(
+        workdir, file_template, fill_data, extensions
+    )
+    if filename is None:
+        data = copy.deepcopy(fill_data)
+        data["version"] = 1
+        data.pop("comment", None)
+        if not data.get("ext"):
+            data["ext"] = extensions[0]
+        filename = StringTemplate.format_strict_template(file_template, data)
+
+    if full_path:
+        return os.path.normpath(os.path.join(workdir, filename))
+
+    return filename
diff --git a/openpype/lib/delivery.py b/openpype/lib/delivery.py
index 03abe5802c..ffcfe9fa4d 100644
--- a/openpype/lib/delivery.py
+++ b/openpype/lib/delivery.py
@@ -5,6 +5,11 @@ import glob
 import clique
 import collections
 
+from .path_templates import (
+    StringTemplate,
+    TemplateUnsolved,
+)
+
 
 def collect_frames(files):
     """
@@ -52,8 +57,6 @@ def sizeof_fmt(num, suffix='B'):
 
 
 def path_from_representation(representation, anatomy):
-    from avalon import pipeline  # safer importing
-
     try:
         template = representation["data"]["template"]
 
@@ -63,12 +66,10 @@ def path_from_representation(representation, anatomy):
     try:
         context = representation["context"]
         context["root"] = anatomy.roots
-        path = pipeline.format_template_with_optional_keys(
-            context, template
-        )
-        path = os.path.normpath(path.replace("/", "\\"))
+        path = StringTemplate.format_strict_template(template, context)
+        return os.path.normpath(path)
 
-    except KeyError:
+    except TemplateUnsolved:
         # Template references unavailable data
         return None
 
diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 06505b4b47..fad4d14ea0 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -236,6 +236,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
                 environment["OPENPYPE_MONGO"] = mongo_url
 
         args = [
+            "--headless",
             'publish',
             roothless_metadata_path,
             "--targets", "deadline",
diff --git a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
index 82c2494e7a..eeb1f7744c 100644
--- a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
+++ b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
@@ -46,6 +46,7 @@ def inject_openpype_environment(deadlinePlugin):
 
         args = [
             openpype_app,
+            "--headless",
             'extractenvironments',
             export_url
         ]
diff --git a/openpype/modules/ftrack/event_handlers_server/event_sync_to_avalon.py b/openpype/modules/ftrack/event_handlers_server/event_sync_to_avalon.py
index eea6436b53..46c333c4c4 100644
--- a/openpype/modules/ftrack/event_handlers_server/event_sync_to_avalon.py
+++ b/openpype/modules/ftrack/event_handlers_server/event_sync_to_avalon.py
@@ -199,8 +199,10 @@ class SyncToAvalonEvent(BaseEvent):
             if proj:
                 ftrack_id = proj["data"].get("ftrackId")
                 if ftrack_id is None:
-                    ftrack_id = self._update_project_ftrack_id()
-                    proj["data"]["ftrackId"] = ftrack_id
+                    self.handle_missing_ftrack_id(proj)
+                    ftrack_id = proj["data"]["ftrackId"]
+                self._avalon_ents_by_ftrack_id[ftrack_id] = proj
+
                 self._avalon_ents_by_ftrack_id[ftrack_id] = proj
                 for ent in ents:
                     ftrack_id = ent["data"].get("ftrackId")
@@ -209,15 +211,78 @@ class SyncToAvalonEvent(BaseEvent):
                     self._avalon_ents_by_ftrack_id[ftrack_id] = ent
         return self._avalon_ents_by_ftrack_id
 
-    def _update_project_ftrack_id(self):
-        ftrack_id = self.cur_project["id"]
+    def handle_missing_ftrack_id(self, doc):
+        # TODO handling of missing ftrack id is primarily issue of editorial
+        #   publishing it would be better to find out what causes that
+        #   ftrack id is removed during the publishing
+        ftrack_id = doc["data"].get("ftrackId")
+        if ftrack_id is not None:
+            return
 
+        if doc["type"] == "project":
+            ftrack_id = self.cur_project["id"]
+
+            self.dbcon.update_one(
+                {"type": "project"},
+                {"$set": {
+                    "data.ftrackId": ftrack_id,
+                    "data.entityType": self.cur_project.entity_type
+                }}
+            )
+
+            doc["data"]["ftrackId"] = ftrack_id
+            doc["data"]["entityType"] = self.cur_project.entity_type
+            self.log.info("Updated ftrack id of project \"{}\"".format(
+                self.cur_project["full_name"]
+            ))
+            return
+
+        if doc["type"] != "asset":
+            return
+
+        doc_parents = doc.get("data", {}).get("parents")
+        if doc_parents is None:
+            return
+
+        entities = self.process_session.query((
+            "select id, link from TypedContext"
+            " where project_id is \"{}\" and name is \"{}\""
+        ).format(self.cur_project["id"], doc["name"])).all()
+        self.log.info("Entities: {}".format(str(entities)))
+        matching_entity = None
+        for entity in entities:
+            parents = []
+            for item in entity["link"]:
+                if item["id"] == entity["id"]:
+                    break
+                low_type = item["type"].lower()
+                if low_type == "typedcontext":
+                    parents.append(item["name"])
+            if doc_parents == parents:
+                matching_entity = entity
+                break
+
+        if matching_entity is None:
+            return
+
+        ftrack_id = matching_entity["id"]
         self.dbcon.update_one(
-            {"type": "project"},
-            {"$set": {"data.ftrackId": ftrack_id}}
+            {"_id": doc["_id"]},
+            {"$set": {
+                "data.ftrackId": ftrack_id,
+                "data.entityType": matching_entity.entity_type
+            }}
         )
+        doc["data"]["ftrackId"] = ftrack_id
+        doc["data"]["entityType"] = matching_entity.entity_type
 
-        return ftrack_id
+        entity_path_items = []
+        for item in entity["link"]:
+            entity_path_items.append(item["name"])
+        self.log.info("Updated ftrack id of entity \"{}\"".format(
+            "/".join(entity_path_items)
+        ))
+        self._avalon_ents_by_ftrack_id[ftrack_id] = doc
 
     @property
     def avalon_subsets_by_parents(self):
@@ -857,7 +922,14 @@ class SyncToAvalonEvent(BaseEvent):
                 if vis_par is None:
                     vis_par = proj["_id"]
                 parent_ent = self.avalon_ents_by_id[vis_par]
-                parent_ftrack_id = parent_ent["data"]["ftrackId"]
+
+                parent_ftrack_id = parent_ent["data"].get("ftrackId")
+                if parent_ftrack_id is None:
+                    self.handle_missing_ftrack_id(parent_ent)
+                    parent_ftrack_id = parent_ent["data"].get("ftrackId")
+                    if parent_ftrack_id is None:
+                        continue
+
                 parent_ftrack_ent = self.ftrack_ents_by_id.get(
                     parent_ftrack_id
                 )
@@ -2128,7 +2200,13 @@ class SyncToAvalonEvent(BaseEvent):
                 vis_par = avalon_ent["parent"]
 
             parent_ent = self.avalon_ents_by_id[vis_par]
-            parent_ftrack_id = parent_ent["data"]["ftrackId"]
+            parent_ftrack_id = parent_ent["data"].get("ftrackId")
+            if parent_ftrack_id is None:
+                self.handle_missing_ftrack_id(parent_ent)
+                parent_ftrack_id = parent_ent["data"].get("ftrackId")
+                if parent_ftrack_id is None:
+                    continue
+
             if parent_ftrack_id not in entities_dict:
                 entities_dict[parent_ftrack_id] = {
                     "children": [],
diff --git a/openpype/modules/ftrack/event_handlers_server/event_user_assigment.py b/openpype/modules/ftrack/event_handlers_server/event_user_assigment.py
index efc1e76775..96243c8c36 100644
--- a/openpype/modules/ftrack/event_handlers_server/event_user_assigment.py
+++ b/openpype/modules/ftrack/event_handlers_server/event_user_assigment.py
@@ -87,8 +87,8 @@ class UserAssigmentEvent(BaseEvent):
         if not user_id:
             return None, None
 
-        task = session.query('Task where id is "{}"'.format(task_id)).one()
-        user = session.query('User where id is "{}"'.format(user_id)).one()
+        task = session.query('Task where id is "{}"'.format(task_id)).first()
+        user = session.query('User where id is "{}"'.format(user_id)).first()
 
         return task, user
 
diff --git a/openpype/modules/ftrack/event_handlers_user/action_delete_old_versions.py b/openpype/modules/ftrack/event_handlers_user/action_delete_old_versions.py
index c66d1819ac..1b694e25f1 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_delete_old_versions.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_delete_old_versions.py
@@ -5,11 +5,11 @@ import uuid
 import clique
 from pymongo import UpdateOne
 
-from openpype_modules.ftrack.lib import BaseAction, statics_icon
 from avalon.api import AvalonMongoDB
-from openpype.api import Anatomy
 
-import avalon.pipeline
+from openpype.api import Anatomy
+from openpype.lib import StringTemplate, TemplateUnsolved
+from openpype_modules.ftrack.lib import BaseAction, statics_icon
 
 
 class DeleteOldVersions(BaseAction):
@@ -563,18 +563,16 @@ class DeleteOldVersions(BaseAction):
         try:
             context = representation["context"]
             context["root"] = anatomy.roots
-            path = avalon.pipeline.format_template_with_optional_keys(
-                context, template
-            )
+            path = StringTemplate.format_strict_template(template, context)
             if "frame" in context:
                 context["frame"] = self.sequence_splitter
                 sequence_path = os.path.normpath(
-                    avalon.pipeline.format_template_with_optional_keys(
+                    StringTemplate.format_strict_template(
                         context, template
                     )
                 )
 
-        except KeyError:
+        except (KeyError, TemplateUnsolved):
             # Template references unavailable data
             return (None, None)
 
diff --git a/openpype/modules/ftrack/lib/ftrack_event_handler.py b/openpype/modules/ftrack/lib/ftrack_event_handler.py
index af565c5421..0a70b0e301 100644
--- a/openpype/modules/ftrack/lib/ftrack_event_handler.py
+++ b/openpype/modules/ftrack/lib/ftrack_event_handler.py
@@ -44,7 +44,7 @@ class BaseEvent(BaseHandler):
         return self._get_entities(
             event,
             session,
-            ignore=['socialfeed', 'socialnotification']
+            ignore=['socialfeed', 'socialnotification', 'team']
         )
 
     def get_project_name_from_event(self, session, event, project_id):
diff --git a/openpype/pipeline/load/utils.py b/openpype/pipeline/load/utils.py
index e48074ebb1..21c62218b0 100644
--- a/openpype/pipeline/load/utils.py
+++ b/openpype/pipeline/load/utils.py
@@ -526,7 +526,7 @@ def get_representation_path(representation, root=None, dbcon=None):
 
     """
 
-    from openpype.lib import StringTemplate
+    from openpype.lib import StringTemplate, TemplateUnsolved
 
     if dbcon is None:
         dbcon = io
@@ -543,13 +543,14 @@ def get_representation_path(representation, root=None, dbcon=None):
         try:
             context = representation["context"]
             context["root"] = root
-            template_obj = StringTemplate(template)
-            path = str(template_obj.format(context))
+            path = StringTemplate.format_strict_template(
+                template, context
+            )
             # Force replacing backslashes with forward slashed if not on
             #   windows
             if platform.system().lower() != "windows":
                 path = path.replace("\\", "/")
-        except KeyError:
+        except (TemplateUnsolved, KeyError):
             # Template references unavailable data
             return None
 
diff --git a/openpype/plugins/publish/integrate_new.py b/openpype/plugins/publish/integrate_new.py
index c26d3559ec..9b2ab9c935 100644
--- a/openpype/plugins/publish/integrate_new.py
+++ b/openpype/plugins/publish/integrate_new.py
@@ -13,14 +13,15 @@ from bson.objectid import ObjectId
 from pymongo import DeleteOne, InsertOne
 import pyblish.api
 from avalon import io
-from avalon.api import format_template_with_optional_keys
 import openpype.api
 from datetime import datetime
 # from pype.modules import ModulesManager
 from openpype.lib.profiles_filtering import filter_profiles
 from openpype.lib import (
     prepare_template_data,
-    create_hard_link
+    create_hard_link,
+    StringTemplate,
+    TemplateUnsolved
 )
 
 # this is needed until speedcopy for linux is fixed
@@ -855,9 +856,10 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
         fill_pairs = prepare_template_data(fill_pairs)
 
         try:
-            filled_template = \
-                format_template_with_optional_keys(fill_pairs, template)
-        except KeyError:
+            filled_template = StringTemplate.format_strict_template(
+                template, fill_pairs
+            )
+        except (KeyError, TemplateUnsolved):
             keys = []
             if fill_pairs:
                 keys = fill_pairs.keys()
diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py
index da5524331a..713992bc4b 100644
--- a/openpype/tools/workfiles/app.py
+++ b/openpype/tools/workfiles/app.py
@@ -2,7 +2,6 @@ import sys
 import os
 import re
 import copy
-import getpass
 import shutil
 import logging
 import datetime
@@ -27,7 +26,8 @@ from openpype.lib import (
     save_workfile_data_to_doc,
     get_workfile_template_key,
     create_workdir_extra_folders,
-    get_workdir_data
+    get_workdir_data,
+    get_last_workfile_with_version
 )
 from openpype.lib.avalon_context import (
     update_current_task,
@@ -441,7 +441,7 @@ class NameWindow(QtWidgets.QDialog):
 
             data["ext"] = data["ext"][1:]
 
-            version = api.last_workfile_with_version(
+            version = get_last_workfile_with_version(
                 self.root, template, data, extensions
             )[1]
 
@@ -469,7 +469,7 @@ class NameWindow(QtWidgets.QDialog):
                 # Log warning
                 if idx == 0:
                     log.warning((
-                        "BUG: Function `last_workfile_with_version` "
+                        "BUG: Function `get_last_workfile_with_version` "
                         "didn't return last version."
                     ))
             # Raise exception if even 100 version fallback didn't help
diff --git a/openpype/version.py b/openpype/version.py
index 1ef25e3f48..2390309e76 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.9.1"
+__version__ = "3.9.2-nightly.1"
diff --git a/pyproject.toml b/pyproject.toml
index 7c09495a99..90e264d456 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.9.1" # OpenPype
+version = "3.9.2-nightly.1" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"
diff --git a/tools/ci_tools.py b/tools/ci_tools.py
index aeb367af38..4c59cd6af6 100644
--- a/tools/ci_tools.py
+++ b/tools/ci_tools.py
@@ -8,8 +8,12 @@ import os
 
 def get_release_type_github(Log, github_token):
     # print(Log)
-    minor_labels = ["type: feature", "type: deprecated"]
-    patch_labels = ["type: enhancement", "type: bug"]
+    minor_labels = ["Bump Minor"]
+    # patch_labels = [
+    #     "type: enhancement",
+    #     "type: bug",
+    #     "type: deprecated",
+    #     "type: Feature"]
 
     g = Github(github_token)
     repo = g.get_repo("pypeclub/OpenPype")
@@ -28,9 +32,12 @@ def get_release_type_github(Log, github_token):
 
     if any(label in labels for label in minor_labels):
         return "minor"
-
-    if any(label in labels for label in patch_labels):
+    else:
         return "patch"
+
+    # TODO: if all is working fine, this part can be cleaned up eventually 
+    # if any(label in labels for label in patch_labels):
+    #     return "patch"
             
     return None