Merge "Data stall intent definition" into pi-dev