Merge branch 'fix-temporary-scope-finding' into global-barrier-handling