Merge 'delete tidspbridge branch' into staging-next