Merge "Northbound cleanup for static routing"