Re #7056 Move to api v2
Merge remote-tracking branch 'origin/feature/7056_data_stitching_api2'