fix(router): follow-ups to #2636, #2637, #2638, #2639 and #2641 - #2647

fix(router): follow-ups to #2636, #2637, #2638, #2639 and #2641#2647

hello-alexmcc wants to merge 2 commits into

mainsmg-project/smg:mainfrom

fix/router-hardening-followupssmg-project/smg:fix/router-hardening-followupsCopy head branch name to clipboard