diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2
index 890490f5..f9f63771 100644
--- a/scenarios/incoming_peer/0003_test.yml.tt2
+++ b/scenarios/incoming_peer/0003_test.yml.tt2
@@ -5,6 +5,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_CLEAR_PEER_IN_PREF:
@@ -34,8 +36,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -44,6 +44,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -61,6 +63,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
@@ -101,7 +105,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:004321001@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite/0003_test.yml.tt2 b/scenarios/invite/0003_test.yml.tt2
index da46d78e..fd3faf1a 100644
--- a/scenarios/invite/0003_test.yml.tt2
+++ b/scenarios/invite/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite/0005_test.yml.tt2 b/scenarios/invite/0005_test.yml.tt2
index b360621e..cd3b38d3 100644
--- a/scenarios/invite/0005_test.yml.tt2
+++ b/scenarios/invite/0005_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -41,8 +43,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -51,6 +51,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -68,6 +70,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
@@ -114,7 +118,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_allowedcli_match/0003_test.yml.tt2 b/scenarios/invite_allowedcli_match/0003_test.yml.tt2
index 0f137b91..12b8fb45 100644
--- a/scenarios/invite_allowedcli_match/0003_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
index 7ff99575..952e566c 100644
--- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -41,8 +43,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -51,6 +51,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -68,6 +70,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
@@ -114,7 +118,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2
index 5ff3b8e6..d67bc7b1 100644
--- a/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
index f83ef403..3fb8e4bf 100644
--- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -41,8 +43,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -51,6 +51,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -68,6 +70,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
@@ -114,7 +118,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_allowip/0001_test.yml.tt2 b/scenarios/invite_allowip/0001_test.yml.tt2
index 6b0b5947..a25efc52 100644
--- a/scenarios/invite_allowip/0001_test.yml.tt2
+++ b/scenarios/invite_allowip/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_allowip/0003_test.yml.tt2 b/scenarios/invite_allowip/0003_test.yml.tt2
index 54a4cc4d..179443fa 100644
--- a/scenarios/invite_allowip/0003_test.yml.tt2
+++ b/scenarios/invite_allowip/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockin_blst/0001_test.yml.tt2 b/scenarios/invite_blockin_blst/0001_test.yml.tt2
index 6b0b5947..a25efc52 100644
--- a/scenarios/invite_blockin_blst/0001_test.yml.tt2
+++ b/scenarios/invite_blockin_blst/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockin_blst/0003_test.yml.tt2 b/scenarios/invite_blockin_blst/0003_test.yml.tt2
index 2f78b066..687ecfc4 100644
--- a/scenarios/invite_blockin_blst/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_blst/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockin_clir/0001_test.yml.tt2 b/scenarios/invite_blockin_clir/0001_test.yml.tt2
index 6b0b5947..a25efc52 100644
--- a/scenarios/invite_blockin_clir/0001_test.yml.tt2
+++ b/scenarios/invite_blockin_clir/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockin_clir/0003_test.yml.tt2 b/scenarios/invite_blockin_clir/0003_test.yml.tt2
index 2f78b066..687ecfc4 100644
--- a/scenarios/invite_blockin_clir/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_clir/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockin_wlst/0001_test.yml.tt2 b/scenarios/invite_blockin_wlst/0001_test.yml.tt2
index 6b0b5947..a25efc52 100644
--- a/scenarios/invite_blockin_wlst/0001_test.yml.tt2
+++ b/scenarios/invite_blockin_wlst/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 b/scenarios/invite_blockin_wlst/0003_test.yml.tt2
index 2f78b066..687ecfc4 100644
--- a/scenarios/invite_blockin_wlst/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_wlst/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_ncos/0001_test.yml.tt2 b/scenarios/invite_blockout_ncos/0001_test.yml.tt2
index 6b0b5947..a25efc52 100644
--- a/scenarios/invite_blockout_ncos/0001_test.yml.tt2
+++ b/scenarios/invite_blockout_ncos/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 b/scenarios/invite_blockout_ncos/0003_test.yml.tt2
index ff0f7435..7ad687c7 100644
--- a/scenarios/invite_blockout_ncos/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_ncos/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_pinoverride/0003_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0003_test.yml.tt2
index 5ccb1257..286fb01f 100644
--- a/scenarios/invite_blockout_pinoverride/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
index 85c72d13..d036c538 100644
--- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -39,8 +41,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -49,6 +49,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -66,6 +68,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
@@ -112,7 +116,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_blockout_wlst/0001_test.yml.tt2 b/scenarios/invite_blockout_wlst/0001_test.yml.tt2
index 6b0b5947..a25efc52 100644
--- a/scenarios/invite_blockout_wlst/0001_test.yml.tt2
+++ b/scenarios/invite_blockout_wlst/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_blockout_wlst/0003_test.yml.tt2 b/scenarios/invite_blockout_wlst/0003_test.yml.tt2
index a8b339dd..24fef3ad 100644
--- a/scenarios/invite_blockout_wlst/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_wlst/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_callforward/0007_test.yml.tt2 b/scenarios/invite_callforward/0007_test.yml.tt2
index bd368363..513ed131 100644
--- a/scenarios/invite_callforward/0007_test.yml.tt2
+++ b/scenarios/invite_callforward/0007_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2
index 9e99f709..07c27beb 100644
--- a/scenarios/invite_callforward/0009_test.yml.tt2
+++ b/scenarios/invite_callforward/0009_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2
index e588d52c..9c0e67ac 100644
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - end|ROUTE_FIND_CALLER:
@@ -19,6 +21,10 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_CLI_ALLOWED:
+  - end|ROUTE_CHECK_CLI_ALLOWED:
+  - end|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
@@ -35,8 +41,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -45,6 +49,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -62,6 +68,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
diff --git a/scenarios/invite_callforward/0023_test.yml.tt2 b/scenarios/invite_callforward/0023_test.yml.tt2
index 1bb5aff2..53ea6aa1 100644
--- a/scenarios/invite_callforward/0023_test.yml.tt2
+++ b/scenarios/invite_callforward/0023_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_callforward/0025_test.yml.tt2 b/scenarios/invite_callforward/0025_test.yml.tt2
index e9dad18d..fae60e42 100644
--- a/scenarios/invite_callforward/0025_test.yml.tt2
+++ b/scenarios/invite_callforward/0025_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -41,8 +43,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -51,6 +51,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -68,6 +70,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2
index 866d4317..eb5542d9 100644
--- a/scenarios/invite_callforward/0029_test.yml.tt2
+++ b/scenarios/invite_callforward/0029_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - end|ROUTE_FIND_CALLER:
@@ -19,6 +21,10 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_CLI_ALLOWED:
+  - end|ROUTE_CHECK_CLI_ALLOWED:
+  - end|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
@@ -35,8 +41,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -45,6 +49,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -62,6 +68,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
diff --git a/scenarios/invite_ignore_allowip/0003_test.yml.tt2 b/scenarios/invite_ignore_allowip/0003_test.yml.tt2
index da46d78e..fd3faf1a 100644
--- a/scenarios/invite_ignore_allowip/0003_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
index b360621e..d4e62ca3 100644
--- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -41,8 +43,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -51,6 +51,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
diff --git a/scenarios/invite_offline/0001_test.yml.tt2 b/scenarios/invite_offline/0001_test.yml.tt2
index 6b0b5947..a25efc52 100644
--- a/scenarios/invite_offline/0001_test.yml.tt2
+++ b/scenarios/invite_offline/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_offline/0003_test.yml.tt2 b/scenarios/invite_offline/0003_test.yml.tt2
index a64aeea5..e0fa6393 100644
--- a/scenarios/invite_offline/0003_test.yml.tt2
+++ b/scenarios/invite_offline/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_offline/0005_test.yml.tt2 b/scenarios/invite_offline/0005_test.yml.tt2
index cc3ed6f1..5feb337b 100644
--- a/scenarios/invite_offline/0005_test.yml.tt2
+++ b/scenarios/invite_offline/0005_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_peerout/0001_test.yml.tt2 b/scenarios/invite_peerout/0001_test.yml.tt2
index e75de174..1f50c853 100644
--- a/scenarios/invite_peerout/0001_test.yml.tt2
+++ b/scenarios/invite_peerout/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_peerout/0003_test.yml.tt2 b/scenarios/invite_peerout/0003_test.yml.tt2
index 14a714ba..3ae8c89a 100644
--- a/scenarios/invite_peerout/0003_test.yml.tt2
+++ b/scenarios/invite_peerout/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -37,8 +39,6 @@ flow:
   - start|ROUTE_BLOCK_OUT:
   - end|ROUTE_BLOCK_OUT:
   - start|ROUTE_INVITE_TO_EXT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PSTN:
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
   - end|ROUTE_CLEAR_PEER_OUT_PREF:
@@ -52,6 +52,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -69,6 +71,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
diff --git a/scenarios/invite_peerout_rewrite/0001_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0001_test.yml.tt2
index e75de174..1f50c853 100644
--- a/scenarios/invite_peerout_rewrite/0001_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
index 8ec0c2eb..7770b947 100644
--- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -37,8 +39,6 @@ flow:
   - start|ROUTE_BLOCK_OUT:
   - end|ROUTE_BLOCK_OUT:
   - start|ROUTE_INVITE_TO_EXT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PSTN:
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
   - end|ROUTE_CLEAR_PEER_OUT_PREF:
@@ -52,6 +52,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -69,6 +71,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
diff --git a/scenarios/invite_redirect/0005_test.yml.tt2 b/scenarios/invite_redirect/0005_test.yml.tt2
index 1e34a9cd..bbf8e328 100644
--- a/scenarios/invite_redirect/0005_test.yml.tt2
+++ b/scenarios/invite_redirect/0005_test.yml.tt2
@@ -5,6 +5,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2
index dd7643bc..0ffacb3b 100644
--- a/scenarios/invite_redirect/0007_test.yml.tt2
+++ b/scenarios/invite_redirect/0007_test.yml.tt2
@@ -5,6 +5,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -40,8 +42,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -50,6 +50,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -101,8 +103,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -111,6 +111,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
diff --git a/scenarios/invite_speeddial/0005_test.yml.tt2 b/scenarios/invite_speeddial/0005_test.yml.tt2
index 9cb87f56..650ad1e8 100644
--- a/scenarios/invite_speeddial/0005_test.yml.tt2
+++ b/scenarios/invite_speeddial/0005_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios/invite_speeddial/0007_test.yml.tt2
index e0da44c4..0e2233a2 100644
--- a/scenarios/invite_speeddial/0007_test.yml.tt2
+++ b/scenarios/invite_speeddial/0007_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -41,8 +43,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -51,6 +51,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -68,6 +70,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
diff --git a/scenarios/invite_speeddial/0014_test.yml.tt2 b/scenarios/invite_speeddial/0014_test.yml.tt2
index f7a41e9e..21535138 100644
--- a/scenarios/invite_speeddial/0014_test.yml.tt2
+++ b/scenarios/invite_speeddial/0014_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_speeddial/0016_test.yml.tt2 b/scenarios/invite_speeddial/0016_test.yml.tt2
index 895b0e3b..299ce240 100644
--- a/scenarios/invite_speeddial/0016_test.yml.tt2
+++ b/scenarios/invite_speeddial/0016_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -41,8 +43,6 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
   - end|ROUTE_ACC_CALLER:
@@ -51,6 +51,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
   - end|ROUTE_PREPARE_SST:
 [% IF PRO -%]
@@ -68,6 +70,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
diff --git a/scenarios/invite_speeddial/0023_test.yml.tt2 b/scenarios/invite_speeddial/0023_test.yml.tt2
index 4e9550b2..8e46e5c3 100644
--- a/scenarios/invite_speeddial/0023_test.yml.tt2
+++ b/scenarios/invite_speeddial/0023_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_speeddial/0025_test.yml.tt2 b/scenarios/invite_speeddial/0025_test.yml.tt2
index ad138bde..32510eb9 100644
--- a/scenarios/invite_speeddial/0025_test.yml.tt2
+++ b/scenarios/invite_speeddial/0025_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -37,8 +39,6 @@ flow:
   - start|ROUTE_BLOCK_OUT:
   - end|ROUTE_BLOCK_OUT:
   - start|ROUTE_INVITE_TO_EXT:
-  - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
   - start|ROUTE_PSTN:
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
diff --git a/scenarios/invite_speeddial/0027_test.yml.tt2 b/scenarios/invite_speeddial/0027_test.yml.tt2
index 132baf57..b018332a 100644
--- a/scenarios/invite_speeddial/0027_test.yml.tt2
+++ b/scenarios/invite_speeddial/0027_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_speeddial/0029_test.yml.tt2 b/scenarios/invite_speeddial/0029_test.yml.tt2
index 024c7a19..a5b362a4 100644
--- a/scenarios/invite_speeddial/0029_test.yml.tt2
+++ b/scenarios/invite_speeddial/0029_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_voicebox/0001_test.yml.tt2 b/scenarios/invite_voicebox/0001_test.yml.tt2
index bd368363..513ed131 100644
--- a/scenarios/invite_voicebox/0001_test.yml.tt2
+++ b/scenarios/invite_voicebox/0001_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2
index 6de462a7..ce833b20 100644
--- a/scenarios/invite_voicebox/0003_test.yml.tt2
+++ b/scenarios/invite_voicebox/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2
index 5520a99a..93204e19 100644
--- a/scenarios/invite_voicebox/0005_test.yml.tt2
+++ b/scenarios/invite_voicebox/0005_test.yml.tt2
@@ -1,4 +1,3 @@
-# INVITE_OFFLINE scenario
 flow:
   - start|MAIN:
   - start|ROUTE_NET_INFO:
@@ -6,6 +5,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - end|ROUTE_FIND_CALLER:
@@ -19,6 +20,10 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_CLI_ALLOWED:
+  - end|ROUTE_CHECK_CLI_ALLOWED:
+  - end|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
@@ -42,6 +47,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
diff --git a/scenarios/reminder/0001_test.yml.tt2 b/scenarios/reminder/0001_test.yml.tt2
index 6151fdd0..db43e670 100644
--- a/scenarios/reminder/0001_test.yml.tt2
+++ b/scenarios/reminder/0001_test.yml.tt2
@@ -1,15 +1,17 @@
 # REMINDER scenario
 flow:
-- start|MAIN:
-- start|ROUTE_NET_INFO:
-- end|ROUTE_NET_INFO:
-- start|ROUTE_PRX_REQUEST:
-- start|ROUTE_INVITE:
-- start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
-- end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
-- start|ROUTE_FIND_CALLER:
-- start|ROUTE_AUTH:
-- exit|ROUTE_AUTH:
+  - start|MAIN:
+  - start|ROUTE_NET_INFO:
+  - end|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INVITE:
+  - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_FIND_CALLER:
+  - start|ROUTE_AUTH:
+  - exit|ROUTE_AUTH:
 sip_in:
   - '^INVITE'
   - 'Contact: sip:testuser1001@'
diff --git a/scenarios/reminder/0003_test.yml.tt2 b/scenarios/reminder/0003_test.yml.tt2
index 3531f6cf..96f8153a 100644
--- a/scenarios/reminder/0003_test.yml.tt2
+++ b/scenarios/reminder/0003_test.yml.tt2
@@ -6,6 +6,8 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
   - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
@@ -50,6 +52,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE: