Fixes 2212 - strict task ordering#2214

amorton wants to merge 2 commits intomainstargate/data-api:mainfrom

ajm/fixes-2212-task-groupstargate/data-api:ajm/fixes-2212-task-groupCopy head branch name to clipboard