Merge "Reduce allocations on location delivery" into sc-v2-dev