Routing debug and beta dashboard integration
Fix merge conflict