publish: Merge branch 'no-router-internally'

generated from commit 418e033b09924bc06358512708ecb138940acc40