diff --git a/scenarios/incoming_foreign_dom/sipp_scenario_responder00_test.yml.tt2 b/scenarios/incoming_foreign_dom/sipp_scenario_responder00_test.yml.tt2
index 64bbe614..0cf6e905 100644
--- a/scenarios/incoming_foreign_dom/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/incoming_foreign_dom/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@incoming-foreign-dom.external.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@incoming-foreign-dom.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/incoming_hih/sipp_scenario_responder01_test.yml.tt2 b/scenarios/incoming_hih/sipp_scenario_responder01_test.yml.tt2
index 4e46677b..6d00b91c 100644
--- a/scenarios/incoming_hih/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/incoming_hih/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@incoming-hih.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@incoming-hih.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/incoming_peer/sipp_scenario_responder00_test.yml.tt2 b/scenarios/incoming_peer/sipp_scenario_responder00_test.yml.tt2
index d7f7d47b..a2e1d9d5 100644
--- a/scenarios/incoming_peer/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/incoming_peer/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@incoming-peer.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/incoming_peer_stir/sipp_scenario_responder00_test.yml.tt2 b/scenarios/incoming_peer_stir/sipp_scenario_responder00_test.yml.tt2
index 0fb60006..cd17b083 100644
--- a/scenarios/incoming_peer_stir/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/incoming_peer_stir/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@incoming-peer-stir.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@incoming-peer-stir.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite/sipp_scenario_responder00_test.yml.tt2
index 66f9fed4..f25f2f9c 100644
--- a/scenarios/invite/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_scenarios_test.testuser1002.phone_number %]@invite.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_allowedcli_match/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_allowedcli_match/sipp_scenario_responder00_test.yml.tt2
index c3824333..4899712c 100644
--- a/scenarios/invite_allowedcli_match/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]99@invite-allowedcli-match.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-allowedcli-match.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00_test.yml.tt2
index f54051f6..1f14471a 100644
--- a/scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-allowedcli-match-alias.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-allowedcli-match-alias.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00_test.yml.tt2
index 85baf18f..0ec2cdd3 100644
--- a/scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:43122122@invite-allowedcli-nonmatch.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-allowedcli-nonmatch.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_anonymous/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_anonymous/sipp_scenario_responder00_test.yml.tt2
index 542fecd1..4d6a4f73 100644
--- a/scenarios/invite_anonymous/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_anonymous/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-anonymous.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_blockout_pinoverride/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/sipp_scenario_responder00_test.yml.tt2
index d476a54e..49566dfd 100644
--- a/scenarios/invite_blockout_pinoverride/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_blockout_pinoverride_scenarios_test.testuser1002.phone_number %]@invite-blockout-pinoverride.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-blockout-pinoverride.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_callee_bye/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_callee_bye/sipp_scenario_responder00_test.yml.tt2
index 37c0193f..0a5d7214 100644
--- a/scenarios/invite_callee_bye/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_callee_bye/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_callee_bye_scenarios_test.testuser1002.phone_number %]@invite-callee-bye.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-callee-bye.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_callforward/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_callforward/sipp_scenario_responder01_test.yml.tt2
index 46034977..645d9eb6 100644
--- a/scenarios/invite_callforward/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_callforward/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_callforward_scenarios_test.testuser1002.phone_number %]@invite-callforward.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@invite-callforward.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_callforward/sipp_scenario_responder02_test.yml.tt2 b/scenarios/invite_callforward/sipp_scenario_responder02_test.yml.tt2
index 59224000..e4a188c8 100644
--- a/scenarios/invite_callforward/sipp_scenario_responder02_test.yml.tt2
+++ b/scenarios/invite_callforward/sipp_scenario_responder02_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.1.responders.0.username %]@[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_callforward_scenarios_test.testuser1002.phone_number %]@invite-callforward.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.1.responders.0.username %]@invite-callforward.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_callforward/sipp_scenario_responder03_test.yml.tt2 b/scenarios/invite_callforward/sipp_scenario_responder03_test.yml.tt2
index 3a20ef2b..82987719 100644
--- a/scenarios/invite_callforward/sipp_scenario_responder03_test.yml.tt2
+++ b/scenarios/invite_callforward/sipp_scenario_responder03_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.1.responders.1.username %]@[% scenarios.1.responders.1.ip %]:[% scenarios.1.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_callforward_scenarios_test.testuser1002.phone_number %]@invite-callforward.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.1.responders.1.username %]@invite-callforward.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfna/sipp_scenario_responder00_test.yml.tt2
index f7a57387..45ece50c 100644
--- a/scenarios/invite_callforward_but_callee_locked_cfna/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_callforward_but_callee_locked_cfna/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_callforward_but_callee_locked_cfna_scenarios_test.testuser1000.phone_number %]@invite-callforward-but-callee-locked-cfna.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_concurrent_max/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_concurrent_max/sipp_scenario_responder00_test.yml.tt2
index db45101f..24fda7e2 100644
--- a/scenarios/invite_concurrent_max/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_concurrent_max/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_concurrent_max_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-concurrent-max.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_concurrent_max_out/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_concurrent_max_out/sipp_scenario_responder00_test.yml.tt2
index e0cc8117..b0b7dcf1 100644
--- a/scenarios/invite_concurrent_max_out/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_concurrent_max_out_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max-out.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_concurrent_max_out_per_account/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/sipp_scenario_responder00_test.yml.tt2
index 42ba56c3..34c99434 100644
--- a/scenarios/invite_concurrent_max_out_per_account/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_concurrent_max_out_per_account_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max-out-per-account.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00_test.yml.tt2
index e8dce27b..0a6755b8 100644
--- a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_concurrent_max_per_account_scenarios_test.testuser1002.phone_number %]@invite-concurrent-max-per-account.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-concurrent-max-per-account.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_emergency/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_emergency/sipp_scenario_responder00_test.yml.tt2
index 00decb7a..af6bfceb 100644
--- a/scenarios/invite_emergency/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_emergency/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:E1112@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_emergency_scenarios_test.testuser1002.phone_number %]@invite-emergency.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:E1112@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_emergency_cirpack/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_emergency_cirpack/sipp_scenario_responder00_test.yml.tt2
index 0d038fd2..f2efe8f0 100644
--- a/scenarios/invite_emergency_cirpack/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_emergency_cirpack/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:E1112@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_emergency_cirpack_scenarios_test.testuser1002.phone_number %]@invite-emergency-cirpack.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:E1112@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2
index 056f9c01..25bf97c5 100644
--- a/scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:E1112@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_emergency_pidflo_scenarios_test.testuser1002.phone_number %]@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:E1112@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_force_inbound_calls_to_peer/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_force_inbound_calls_to_peer/sipp_scenario_responder01_test.yml.tt2
index d6357bf4..cf3c5713 100644
--- a/scenarios/invite_force_inbound_calls_to_peer/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_force_inbound_calls_to_peer/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% invite_force_inbound_calls_to_peer_scenarios_test.testuser1003.phone_number %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_force_inbound_calls_to_peer_scenarios_test.testuser1002.phone_number %]@invite-force-inbound-calls-to-peer.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% invite_force_inbound_calls_to_peer_scenarios_test.testuser1003.phone_number %]@[% scenarios.0.responders.1.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_force_outbound_calls_to_peer/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_force_outbound_calls_to_peer/sipp_scenario_responder01_test.yml.tt2
index f00764d4..62922aeb 100644
--- a/scenarios/invite_force_outbound_calls_to_peer/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_force_outbound_calls_to_peer/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_force_outbound_calls_to_peer_scenarios_test.testuser1002.phone_number %]@invite-force-outbound-calls-to-peer.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.1.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_foreign_dom/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_foreign_dom/sipp_scenario_responder00_test.yml.tt2
index a9032633..a13afbf1 100644
--- a/scenarios/invite_foreign_dom/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_foreign_dom/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@invite-foreign-dom.external.test SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_foreign_dom_scenarios_test.testuser1002.phone_number %]@invite-foreign-dom.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-foreign-dom.external.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_hdr/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_hdr/sipp_scenario_responder00_test.yml.tt2
index 6081edf1..7cc5a301 100644
--- a/scenarios/invite_hdr/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_hdr/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_hdr_scenarios_test.testuser1002.phone_number %]@invite-hdr.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-hdr.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_hm/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_hm/sipp_scenario_responder00_test.yml.tt2
index b0507bc7..08ba588d 100644
--- a/scenarios/invite_hm/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_hm/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_hm_scenarios_test.testuser1002.phone_number %]@invite-hm.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-hm.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_hm_callforward/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_hm_callforward/sipp_scenario_responder01_test.yml.tt2
index 46784819..051585ca 100644
--- a/scenarios/invite_hm_callforward/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_hm_callforward/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_hm_callforward_scenarios_test.testuser1002.phone_number %]@invite-hm-callforward.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@invite-hm-callforward.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_hm_peerout/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_hm_peerout/sipp_scenario_responder00_test.yml.tt2
index 7da4038c..e3c0035e 100644
--- a/scenarios/invite_hm_peerout/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_ignore_allowip/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_ignore_allowip/sipp_scenario_responder00_test.yml.tt2
index 450c5f9f..d485bd02 100644
--- a/scenarios/invite_ignore_allowip/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_ignore_allowip_scenarios_test.testuser1002.phone_number %]@invite-ignore-allowip.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-ignore-allowip.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_lateoam/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_lateoam/sipp_scenario_responder00_test.yml.tt2
index dba22c37..157df488 100644
--- a/scenarios/invite_lateoam/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_lateoam/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_lateoam_scenarios_test.testuser1002.phone_number %]@invite-lateoam.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-lateoam.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_locmap_add/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_locmap_add/sipp_scenario_responder00_test.yml.tt2
index 01a7aaa8..47886882 100644
--- a/scenarios/invite_locmap_add/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_locmap_add/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_locmap_add_scenarios_test.testuser1000.phone_number %]@invite-locmap-add.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-locmap-add.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_locmap_add/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_locmap_add/sipp_scenario_responder01_test.yml.tt2
index 1f811d42..5cd2cf3e 100644
--- a/scenarios/invite_locmap_add/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_locmap_add/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_locmap_add_scenarios_test.testuser1000.phone_number %]@invite-locmap-add.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@invite-locmap-add.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_locmap_offline/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_locmap_offline/sipp_scenario_responder01_test.yml.tt2
index 66fa1bfe..0ef61a69 100644
--- a/scenarios/invite_locmap_offline/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_locmap_offline/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_locmap_offline_scenarios_test.testuser1000.phone_number %]@invite-locmap-offline.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@invite-locmap-offline.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_locmap_replace/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_locmap_replace/sipp_scenario_responder01_test.yml.tt2
index 3fbe5ba2..222fc0c0 100644
--- a/scenarios/invite_locmap_replace/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_locmap_replace/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_locmap_replace_scenarios_test.testuser1000.phone_number %]@invite-locmap-replace.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@invite-locmap-replace.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_no_refer/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_no_refer/sipp_scenario_responder00_test.yml.tt2
index fb4d1b76..73e97bce 100644
--- a/scenarios/invite_no_refer/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_no_refer/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_no_refer_scenarios_test.testuser1002.phone_number %]@invite-no-refer.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-no-refer.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_pai_none/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_pai_none/sipp_scenario_responder00_test.yml.tt2
index 12998083..5e39fbfa 100644
--- a/scenarios/invite_pai_none/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_pai_none/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_pai_none_scenarios_test.testuser1002.phone_number %]@invite-pai-none.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-pai-none.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_peerout/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_peerout/sipp_scenario_responder00_test.yml.tt2
index 15274a6f..21e61f0d 100644
--- a/scenarios/invite_peerout/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_peerout/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_scenarios_test.testuser1002.phone_number %]@invite-peerout.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_peerout_failover/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_peerout_failover/sipp_scenario_responder00_test.yml.tt2
index 74541b1e..36439a65 100644
--- a/scenarios/invite_peerout_failover/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_failover_scenarios_test.testuser1002.phone_number %]@invite-peerout-failover.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_peerout_failover/sipp_scenario_responder02_test.yml.tt2 b/scenarios/invite_peerout_failover/sipp_scenario_responder02_test.yml.tt2
index df96ff68..093a4fc3 100644
--- a/scenarios/invite_peerout_failover/sipp_scenario_responder02_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/sipp_scenario_responder02_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.2.username %]@[% scenarios.0.responders.2.ip %]:[% scenarios.0.responders.2.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_failover_scenarios_test.testuser1002.phone_number %]@invite-peerout-failover.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_peerout_max_out/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_peerout_max_out/sipp_scenario_responder00_test.yml.tt2
index e29db22e..effbb79c 100644
--- a/scenarios/invite_peerout_max_out/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_peerout_max_out/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_max_out_scenarios_test.testuser1002.phone_number %]@invite-peerout-max-out.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_peerout_rewrite/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_peerout_rewrite/sipp_scenario_responder00_test.yml.tt2
index 1e49082f..1747c4f9 100644
--- a/scenarios/invite_peerout_rewrite/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:4321001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]@invite-peerout-rewrite.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00_test.yml.tt2
index b0874fd0..ebfa32a9 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:4321001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_peerout_stir/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_peerout_stir/sipp_scenario_responder00_test.yml.tt2
index eb1277ee..aea0a048 100644
--- a/scenarios/invite_peerout_stir/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_peerout_stir/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_stir_scenarios_test.testuser1002.phone_number %]@invite-peerout-stir.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_perm_reg/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_perm_reg/sipp_scenario_responder00_test.yml.tt2
index 7c09c47f..b1d1b570 100644
--- a/scenarios/invite_perm_reg/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_perm_reg/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=tcp SIP/2.0'
   - 'Record-Route: <sip:127.3.0.1:5074;transport=tcp;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=tcp:127.3.0.1:5074>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=tcp:127.3.0.1:5074>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_perm_reg_scenarios_test.testuser1002.phone_number %]@invite-perm-reg.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-perm-reg.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_prack/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_prack/sipp_scenario_responder00_test.yml.tt2
index c8140e97..ba5d04a9 100644
--- a/scenarios/invite_prack/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_prack/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_prack_scenarios_test.testuser1012.phone_number %]@invite-prack.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_q_forking/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_q_forking/sipp_scenario_responder00_test.yml.tt2
index 297a1703..2f31a176 100644
--- a/scenarios/invite_q_forking/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_q_forking/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_q_forking_scenarios_test.testuser1002.phone_number %]@invite-q-forking.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-q-forking.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_q_forking/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_q_forking/sipp_scenario_responder01_test.yml.tt2
index c9b245da..2e186841 100644
--- a/scenarios/invite_q_forking/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_q_forking/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_q_forking_scenarios_test.testuser1002.phone_number %]@invite-q-forking.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-q-forking.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_record_call/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_record_call/sipp_scenario_responder00_test.yml.tt2
index d585ae37..070c6e10 100644
--- a/scenarios/invite_record_call/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_record_call/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_record_call_scenarios_test.testuser1002.phone_number %]@invite-record-call.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-record-call.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_redirect/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_redirect/sipp_scenario_responder00_test.yml.tt2
index e264bcf1..c0c359cf 100644
--- a/scenarios/invite_redirect/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_redirect/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_redirect/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_redirect/sipp_scenario_responder01_test.yml.tt2
index a4ab0126..1154681d 100644
--- a/scenarios/invite_redirect/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_redirect/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_redirect_blocked/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_redirect_blocked/sipp_scenario_responder00_test.yml.tt2
index dcea083e..e6aed2c2 100644
--- a/scenarios/invite_redirect_blocked/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_redirect_blocked/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@invite-redirect-blocked.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-blocked.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_redirect_tel_uri/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/sipp_scenario_responder00_test.yml.tt2
index 470cdc93..2c23ef39 100644
--- a/scenarios/invite_redirect_tel_uri/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_redirect_tel_uri/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-tel-uri.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_redirect_tel_uri/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/sipp_scenario_responder01_test.yml.tt2
index 9be6aeb2..f88fe2e9 100644
--- a/scenarios/invite_redirect_tel_uri/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_redirect_tel_uri/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@invite-redirect-tel-uri.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_reinvite_caller_transcoding/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/sipp_scenario_responder00_test.yml.tt2
index 9cf8c4a0..9cfc9cfa 100644
--- a/scenarios/invite_reinvite_caller_transcoding/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_reinvite_caller_transcoding/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_reinvite_caller_transcoding_scenarios_test.testuser1002.phone_number %]@invite-reinvite-caller-transcoding.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
@@ -36,7 +36,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_reinvite_caller_transcoding_scenarios_test.testuser1002.phone_number %]@invite-reinvite-caller-transcoding.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_reinvite_transcoding/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/sipp_scenario_responder00_test.yml.tt2
index 141aa45f..c33bced1 100644
--- a/scenarios/invite_reinvite_transcoding/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_reinvite_transcoding/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@invite-reinvite-transcoding.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-reinvite-transcoding.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_retrans/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_retrans/sipp_scenario_responder00_test.yml.tt2
index bb8ff1e0..b98ec9e0 100644
--- a/scenarios/invite_retrans/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_retrans/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_retrans_scenarios_test.testuser1002.phone_number %]@invite-retrans.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-retrans.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_sdp_filter/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_sdp_filter/sipp_scenario_responder00_test.yml.tt2
index e2b0ff80..8274a77c 100644
--- a/scenarios/invite_sdp_filter/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_sdp_filter/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_sdp_filter_scenarios_test.testuser1002.phone_number %]@invite-sdp-filter.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-sdp-filter.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_sdp_filter/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_sdp_filter/sipp_scenario_responder01_test.yml.tt2
index 5cb7f8b0..020b1cdb 100644
--- a/scenarios/invite_sdp_filter/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_sdp_filter/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.1.responders.0.username %]@[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_sdp_filter_scenarios_test.testuser1002.phone_number %]@invite-sdp-filter.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.1.responders.0.username %]@invite-sdp-filter.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_stir/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_stir/sipp_scenario_responder00_test.yml.tt2
index 4803bf4d..68e6a197 100644
--- a/scenarios/invite_stir/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_stir/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_stir_scenarios_test.testuser1002.phone_number %]@invite-stir.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-stir.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_stir/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_stir/sipp_scenario_responder01_test.yml.tt2
index d8e078f6..609758e1 100644
--- a/scenarios/invite_stir/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/invite_stir/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.1.responders.0.username %]@[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_stir_scenarios_test.testuser1002.phone_number %]@invite-stir.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.1.responders.0.username %]@invite-stir.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_tcp_udp/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_tcp_udp/sipp_scenario_responder00_test.yml.tt2
index d9f261ba..e09de982 100644
--- a/scenarios/invite_tcp_udp/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_tcp_udp/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_tcp_udp_scenarios_test.testuser1002.phone_number %]@invite-tcp-udp.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-tcp-udp.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_tcp_udp_reinvite/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/sipp_scenario_responder00_test.yml.tt2
index 3a4f819e..3d627a6b 100644
--- a/scenarios/invite_tcp_udp_reinvite/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_tcp_udp_reinvite_scenarios_test.testuser1002.phone_number %]@invite-tcp-udp-reinvite.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-tcp-udp-reinvite.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_trusted_anonymous/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_trusted_anonymous/sipp_scenario_responder00_test.yml.tt2
index 0e1e8070..bf1d8644 100644
--- a/scenarios/invite_trusted_anonymous/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_trusted_anonymous/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-trusted-anonymous.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/invite_trusted_peerout_stir/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_trusted_peerout_stir/sipp_scenario_responder00_test.yml.tt2
index c0e3bf16..bbc1691e 100644
--- a/scenarios/invite_trusted_peerout_stir/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_trusted_peerout_stir/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_trusted_peerout_stir_scenarios_test.testuser1002.phone_number %]@invite-trusted-peerout-stir.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/lock_ported/sipp_scenario_responder01_test.yml.tt2 b/scenarios/lock_ported/sipp_scenario_responder01_test.yml.tt2
index adbe04cb..27e94c61 100644
--- a/scenarios/lock_ported/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios/lock_ported/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% lock_ported_scenarios_test.testuser1002.phone_number %]@lock-ported.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.1.username %]@lock-ported.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/timer_session_callee_only_supported/sipp_scenario_responder00_test.yml.tt2 b/scenarios/timer_session_callee_only_supported/sipp_scenario_responder00_test.yml.tt2
index 6cf0a158..ff7e3608 100644
--- a/scenarios/timer_session_callee_only_supported/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/timer_session_callee_only_supported/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@timer-session-callee-only-supported.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@timer-session-callee-only-supported.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/timer_session_caller_only_supported/sipp_scenario_responder00_test.yml.tt2 b/scenarios/timer_session_caller_only_supported/sipp_scenario_responder00_test.yml.tt2
index 6eb3eeea..6a52e294 100644
--- a/scenarios/timer_session_caller_only_supported/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/timer_session_caller_only_supported/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@timer-session-caller-only-supported.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@timer-session-caller-only-supported.scenarios.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios/timer_session_supported/sipp_scenario_responder00_test.yml.tt2 b/scenarios/timer_session_supported/sipp_scenario_responder00_test.yml.tt2
index 1acf86be..92383ac1 100644
--- a/scenarios/timer_session_supported/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/timer_session_supported/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@timer-session-supported.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@timer-session-supported.scenarios.test>'
   - 'CSeq: \d+ INVITE'
@@ -39,7 +39,7 @@ messages:
 - - 'ACK sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@timer-session-supported.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@timer-session-supported.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
diff --git a/scenarios_lnp/incoming_peer/sipp_scenario_responder00_test.yml.tt2 b/scenarios_lnp/incoming_peer/sipp_scenario_responder00_test.yml.tt2
index cc585d9b..e377d25a 100644
--- a/scenarios_lnp/incoming_peer/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% extra_info.phone_numbers.1 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios-lnp.test>;tag=[\w-]+'
   - 'To: <sip:[% extra_info.phone_numbers.1 %]@[% scenarios.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_lnp/invite/sipp_scenario_responder00_test.yml.tt2 b/scenarios_lnp/invite/sipp_scenario_responder00_test.yml.tt2
index 380b5591..edf13981 100644
--- a/scenarios_lnp/invite/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios_lnp/invite/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_scenarios_lnp_test.testuser1002.phone_number %]@invite.scenarios-lnp.test>;tag=[\w-]+'
   - 'To: <sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_lnp/invite_ncos_black/sipp_scenario_responder02_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/sipp_scenario_responder02_test.yml.tt2
index 8f8bfa09..7c89adf9 100644
--- a/scenarios_lnp/invite_ncos_black/sipp_scenario_responder02_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/sipp_scenario_responder02_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% extra_info.phone_numbers.4 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_ncos_black_scenarios_lnp_test.testuser1002.phone_number %]@invite-ncos-black.scenarios-lnp.test>;tag=[\w-]+'
   - 'To: <sip:[% extra_info.phone_numbers.4 %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_lnp/invite_ncos_white/sipp_scenario_responder00_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/sipp_scenario_responder00_test.yml.tt2
index f3e6b334..6e874483 100644
--- a/scenarios_lnp/invite_ncos_white/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% extra_info.phone_numbers.2 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_ncos_white_scenarios_lnp_test.testuser1002.phone_number %]@invite-ncos-white.scenarios-lnp.test>;tag=[\w-]+'
   - 'To: <sip:[% extra_info.phone_numbers.2 %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_lnp/invite_ncos_white/sipp_scenario_responder01_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/sipp_scenario_responder01_test.yml.tt2
index 7a522ee9..2184ad44 100644
--- a/scenarios_lnp/invite_ncos_white/sipp_scenario_responder01_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/sipp_scenario_responder01_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% extra_info.phone_numbers.1 %]@[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_ncos_white_scenarios_lnp_test.testuser1002.phone_number %]@invite-ncos-white.scenarios-lnp.test>;tag=[\w-]+'
   - 'To: <sip:[% extra_info.phone_numbers.1 %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_lnp/invite_peerout/sipp_scenario_responder00_test.yml.tt2 b/scenarios_lnp/invite_peerout/sipp_scenario_responder00_test.yml.tt2
index 4032f382..905d882b 100644
--- a/scenarios_lnp/invite_peerout/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:0043test28881001;npdi@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>;tag=[\w-]+'
   - 'To: <sip:0043test28881001;npdi@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_lnp/invite_peerout_rn/sipp_scenario_responder00_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/sipp_scenario_responder00_test.yml.tt2
index d6a92c38..8c0676bc 100644
--- a/scenarios_lnp/invite_peerout_rn/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %];npdi;rn=004328881001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+>'
   - 'From: <sip:[% invite_peerout_rn_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout-rn.scenarios-lnp.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02_test.yml.tt2
index b33832d6..5c44f74f 100644
--- a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
   - 'From: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]@incoming-shared-line.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.username %]@incoming-shared-line.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder03_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder03_test.yml.tt2
index ed135066..1683bcb9 100644
--- a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder03_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder03_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.2.responders.1.username %]@[% scenarios.2.responders.1.ip %]:[% scenarios.2.responders.1.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
   - 'From: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]@incoming-shared-line.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.username %]@incoming-shared-line.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_pbx/invite/sipp_scenario_responder00_test.yml.tt2 b/scenarios_pbx/invite/sipp_scenario_responder00_test.yml.tt2
index d4e74b0b..dc5290d1 100644
--- a/scenarios_pbx/invite/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios_pbx/invite/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
   - 'From: <sip:[% invite_scenarios_pbx_test.testuser1002.phone_number %]@invite.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_pbx/invite_alias/sipp_scenario_responder00_test.yml.tt2 b/scenarios_pbx/invite_alias/sipp_scenario_responder00_test.yml.tt2
index 68f82b80..0d8c25bf 100644
--- a/scenarios_pbx/invite_alias/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios_pbx/invite_alias/sipp_scenario_responder00_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
   - 'From: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_pbx/invite_alias_devid/sipp_scenario_responder02_test.yml.tt2 b/scenarios_pbx/invite_alias_devid/sipp_scenario_responder02_test.yml.tt2
index 0eb54ee8..498ab43b 100644
--- a/scenarios_pbx/invite_alias_devid/sipp_scenario_responder02_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid/sipp_scenario_responder02_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.2.devid %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
   - 'From: <sip:[% invite_alias_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.2.devid %]@invite-alias-devid.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_pbx/invite_alias_devid_fulllookup/sipp_scenario_responder02_test.yml.tt2 b/scenarios_pbx/invite_alias_devid_fulllookup/sipp_scenario_responder02_test.yml.tt2
index 7937c277..13c3620e 100644
--- a/scenarios_pbx/invite_alias_devid_fulllookup/sipp_scenario_responder02_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid_fulllookup/sipp_scenario_responder02_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.2.devid %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
   - 'From: <sip:[% invite_alias_devid_fulllookup_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias-devid-fulllookup.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.2.devid %]@invite-alias-devid-fulllookup.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_pbx/invite_shared_line/sipp_scenario_responder02_test.yml.tt2 b/scenarios_pbx/invite_shared_line/sipp_scenario_responder02_test.yml.tt2
index fac8669d..c564108c 100644
--- a/scenarios_pbx/invite_shared_line/sipp_scenario_responder02_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/sipp_scenario_responder02_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
   - 'From: <sip:[% invite_shared_line_scenarios_pbx_test.testuser1002.phone_number %]@invite-shared-line.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.2.responders.0.username %]@invite-shared-line.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_pbx/invite_username_devid/sipp_scenario_responder02_test.yml.tt2 b/scenarios_pbx/invite_username_devid/sipp_scenario_responder02_test.yml.tt2
index 1dce719e..b8a350e7 100644
--- a/scenarios_pbx/invite_username_devid/sipp_scenario_responder02_test.yml.tt2
+++ b/scenarios_pbx/invite_username_devid/sipp_scenario_responder02_test.yml.tt2
@@ -2,7 +2,7 @@ messages:
 - - 'INVITE sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=sip:[% server_ip %]:5060>'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;leg_b=1;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes>'
   - 'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.username %]@invite-username-devid.scenarios-pbx.test>'
   - 'CSeq: \d+ INVITE'