Re #7469 moving some API v1 calls to API v2
Merge branch 'feature/7469_isis_sans_api2' into develop