[21] Fix routing
Merge remote-tracking branch 'origin/migrate_to_sf2_3' into migrate_to_sf2_3

* origin/migrate_to_sf2_3: