Merge pull request #5235 from vgaetera/status-routing