Merge "maintenance/dev: Clean up router.php"