Merge pull request #5267 from vgaetera/status-routing