Re #7056 Move to api v2
Merge branch 'feature/7056_data_stitching_api2' into develop