diff --git a/contrib/chatops/pack.yaml b/contrib/chatops/pack.yaml
index 2c5d0eeba3..b502287051 100644
--- a/contrib/chatops/pack.yaml
+++ b/contrib/chatops/pack.yaml
@@ -1,7 +1,7 @@
 ---
 name: chatops
 description: ChatOps integration pack
-version: 1.1.0
+version: 3.5.0
 python_versions:
   - "2"
   - "3"
diff --git a/contrib/core/pack.yaml b/contrib/core/pack.yaml
index 1334da4b91..e64480ee6e 100644
--- a/contrib/core/pack.yaml
+++ b/contrib/core/pack.yaml
@@ -1,7 +1,7 @@
 ---
 name : core
 description : Basic core actions.
-version : 1.0.1
+version: 3.5.0
 python_versions:
   - "2"
   - "3"
diff --git a/contrib/default/pack.yaml b/contrib/default/pack.yaml
index 98d2834354..7f31f1316c 100644
--- a/contrib/default/pack.yaml
+++ b/contrib/default/pack.yaml
@@ -1,6 +1,6 @@
 ---
 name: default
 description: Default pack where all resources created using the API with no pack specified get saved.
-version: 1.0.0
+version: 3.5.0
 author : StackStorm, Inc.
 email : info@stackstorm.com
diff --git a/contrib/examples/pack.yaml b/contrib/examples/pack.yaml
index 179584e2d0..cd8bce88b2 100644
--- a/contrib/examples/pack.yaml
+++ b/contrib/examples/pack.yaml
@@ -1,6 +1,6 @@
 ---
 name: examples
 description: Example sensors, triggers, actions and rules.
-version: 0.2.1
+version: 3.5.0
 author : StackStorm, Inc.
 email : info@stackstorm.com
diff --git a/contrib/hello_st2/pack.yaml b/contrib/hello_st2/pack.yaml
index b40f1a7cf1..2fb43e4a6c 100644
--- a/contrib/hello_st2/pack.yaml
+++ b/contrib/hello_st2/pack.yaml
@@ -12,7 +12,7 @@ keywords:
     - example
     - test
 # Pack version which must follow semver format (<major>.<minor>.<patch> e.g. 1.0.0)
-version: 0.1.0
+version: 3.5.0
 # A list of major Python versions pack is tested with and works with.
 python_versions:
   - "2"
diff --git a/contrib/linux/pack.yaml b/contrib/linux/pack.yaml
index 1012832fd3..e85aea0d66 100644
--- a/contrib/linux/pack.yaml
+++ b/contrib/linux/pack.yaml
@@ -16,7 +16,7 @@ keywords:
   - open ports
   - processes
   - ps
-version : 1.0.2
+version: 3.5.0
 python_versions:
   - "2"
   - "3"
diff --git a/contrib/packs/pack.yaml b/contrib/packs/pack.yaml
index 531bd24c34..dbfabdfbc1 100644
--- a/contrib/packs/pack.yaml
+++ b/contrib/packs/pack.yaml
@@ -1,7 +1,7 @@
 ---
 name : packs
 description : Pack management functionality.
-version : 2.0.0
+version: 3.5.0
 python_versions:
   - "2"
   - "3"
diff --git a/contrib/runners/action_chain_runner/action_chain_runner/__init__.py b/contrib/runners/action_chain_runner/action_chain_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/action_chain_runner/action_chain_runner/__init__.py
+++ b/contrib/runners/action_chain_runner/action_chain_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/announcement_runner/announcement_runner/__init__.py b/contrib/runners/announcement_runner/announcement_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/announcement_runner/announcement_runner/__init__.py
+++ b/contrib/runners/announcement_runner/announcement_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/http_runner/http_runner/__init__.py b/contrib/runners/http_runner/http_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/http_runner/http_runner/__init__.py
+++ b/contrib/runners/http_runner/http_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/inquirer_runner/inquirer_runner/__init__.py b/contrib/runners/inquirer_runner/inquirer_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/inquirer_runner/inquirer_runner/__init__.py
+++ b/contrib/runners/inquirer_runner/inquirer_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/local_runner/local_runner/__init__.py b/contrib/runners/local_runner/local_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/local_runner/local_runner/__init__.py
+++ b/contrib/runners/local_runner/local_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/noop_runner/noop_runner/__init__.py b/contrib/runners/noop_runner/noop_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/noop_runner/noop_runner/__init__.py
+++ b/contrib/runners/noop_runner/noop_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/orquesta_runner/orquesta_runner/__init__.py b/contrib/runners/orquesta_runner/orquesta_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/orquesta_runner/orquesta_runner/__init__.py
+++ b/contrib/runners/orquesta_runner/orquesta_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/python_runner/python_runner/__init__.py b/contrib/runners/python_runner/python_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/python_runner/python_runner/__init__.py
+++ b/contrib/runners/python_runner/python_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/remote_runner/remote_runner/__init__.py b/contrib/runners/remote_runner/remote_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/remote_runner/remote_runner/__init__.py
+++ b/contrib/runners/remote_runner/remote_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/contrib/runners/winrm_runner/winrm_runner/__init__.py b/contrib/runners/winrm_runner/winrm_runner/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/contrib/runners/winrm_runner/winrm_runner/__init__.py
+++ b/contrib/runners/winrm_runner/winrm_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/requirements.txt b/requirements.txt
index ae871d0140..7bb7abea83 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,8 +18,8 @@ flex==6.14.1
 git+https://github.com/StackStorm/logshipper.git@stackstorm_patched#egg=logshipper
 git+https://github.com/StackStorm/orquesta.git@v1.4.0#egg=orquesta
 git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file
-git+https://github.com/StackStorm/st2-auth-ldap.git@master#egg=st2-auth-ldap
-git+https://github.com/StackStorm/st2-rbac-backend.git@master#egg=st2-rbac-backend
+git+https://github.com/StackStorm/st2-auth-ldap.git@v3.5#egg=st2-auth-ldap
+git+https://github.com/StackStorm/st2-rbac-backend.git@v3.5#egg=st2-rbac-backend
 gitdb==4.0.2
 gitpython==3.1.15
 greenlet==1.0.0
diff --git a/st2actions/st2actions/__init__.py b/st2actions/st2actions/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/st2actions/st2actions/__init__.py
+++ b/st2actions/st2actions/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/st2api/st2api/__init__.py b/st2api/st2api/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/st2api/st2api/__init__.py
+++ b/st2api/st2api/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/st2auth/in-requirements.txt b/st2auth/in-requirements.txt
index d6de70f4f8..92ac84e9d1 100644
--- a/st2auth/in-requirements.txt
+++ b/st2auth/in-requirements.txt
@@ -8,5 +8,5 @@ six
 stevedore
 # For backward compatibility reasons, flat file backend is installed by default
 git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file
-git+https://github.com/StackStorm/st2-auth-ldap.git@master#egg=st2-auth-ldap
+git+https://github.com/StackStorm/st2-auth-ldap.git@v3.5#egg=st2-auth-ldap
 gunicorn
diff --git a/st2auth/requirements.txt b/st2auth/requirements.txt
index 6b6016bcb6..0d386122e4 100644
--- a/st2auth/requirements.txt
+++ b/st2auth/requirements.txt
@@ -8,7 +8,7 @@
 bcrypt==3.2.0
 eventlet==0.30.2
 git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file
-git+https://github.com/StackStorm/st2-auth-ldap.git@master#egg=st2-auth-ldap
+git+https://github.com/StackStorm/st2-auth-ldap.git@v3.5#egg=st2-auth-ldap
 gunicorn==20.1.0
 oslo.config>=1.12.1,<1.13
 passlib==1.7.4
diff --git a/st2auth/st2auth/__init__.py b/st2auth/st2auth/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/st2auth/st2auth/__init__.py
+++ b/st2auth/st2auth/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/st2client/st2client/__init__.py b/st2client/st2client/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/st2client/st2client/__init__.py
+++ b/st2client/st2client/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/st2common/in-requirements.txt b/st2common/in-requirements.txt
index 0a0b01469c..4b865a9578 100644
--- a/st2common/in-requirements.txt
+++ b/st2common/in-requirements.txt
@@ -11,7 +11,7 @@ kombu
 mongoengine
 networkx
 git+https://github.com/StackStorm/orquesta.git@v1.4.0#egg=orquesta
-git+https://github.com/StackStorm/st2-rbac-backend.git@master#egg=st2-rbac-backend
+git+https://github.com/StackStorm/st2-rbac-backend.git@v3.5#egg=st2-rbac-backend
 oslo.config
 paramiko
 pyyaml
diff --git a/st2common/requirements.txt b/st2common/requirements.txt
index 3bd47b7a24..8348009197 100644
--- a/st2common/requirements.txt
+++ b/st2common/requirements.txt
@@ -13,7 +13,7 @@ dnspython>=1.16.0,<2.0.0
 eventlet==0.30.2
 flex==6.14.1
 git+https://github.com/StackStorm/orquesta.git@v1.4.0#egg=orquesta
-git+https://github.com/StackStorm/st2-rbac-backend.git@master#egg=st2-rbac-backend
+git+https://github.com/StackStorm/st2-rbac-backend.git@v3.5#egg=st2-rbac-backend
 gitdb==4.0.2
 gitpython==3.1.15
 greenlet==1.0.0
diff --git a/st2common/st2common/__init__.py b/st2common/st2common/__init__.py
index b3e513c2bc..89a8a596f0 100644
--- a/st2common/st2common/__init__.py
+++ b/st2common/st2common/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.1'
diff --git a/st2common/st2common/util/param.py b/st2common/st2common/util/param.py
index d2604d6a03..89c91e6f58 100644
--- a/st2common/st2common/util/param.py
+++ b/st2common/st2common/util/param.py
@@ -145,7 +145,8 @@ def _process(G, name, value):
         LOG.debug("Dependencies: %s", dependencies)
         if dependencies:
             for dependency in dependencies:
-                G.add_edge(dependency, name)
+                if G.has_node(dependency):
+                    G.add_edge(dependency, name)
     else:
         G.add_node(name, value=value)
 
@@ -213,7 +214,10 @@ def _render(node, render_context):
 
         LOG.debug("Rendering node: %s with context: %s", node, render_context)
 
-        result = ENV.from_string(str(node["template"])).render(render_context)
+        try:
+            result = ENV.from_string(str(node["template"])).render(render_context)
+        except:
+            result = str(node["template"])
 
         LOG.debug("Render complete: %s", result)
 
diff --git a/st2reactor/st2reactor/__init__.py b/st2reactor/st2reactor/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/st2reactor/st2reactor/__init__.py
+++ b/st2reactor/st2reactor/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/st2stream/st2stream/__init__.py b/st2stream/st2stream/__init__.py
index b3e513c2bc..a42cc171ff 100644
--- a/st2stream/st2stream/__init__.py
+++ b/st2stream/st2stream/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'
diff --git a/st2tests/st2tests/__init__.py b/st2tests/st2tests/__init__.py
index 65ec867472..baf8f3506c 100644
--- a/st2tests/st2tests/__init__.py
+++ b/st2tests/st2tests/__init__.py
@@ -30,4 +30,4 @@
     "WorkflowTestCase",
 ]
 
-__version__ = "3.5dev"
+__version__ = '3.5.0'