Merge "Added support to verify extra-routes deletion"