Minor CS fix
Merge branch 'hotfix/4247'

Close #4247
Merge pull request #4289 from ossinkine/router-cs-fix

Minor CS fix
Merge branch 'hotfix/4289' into develop

Forward port #4289