release/21.9.7

Nicholas Styles

@nstyles

6382e3f9 · Merge branch 'cherry-pick-c540e666-21.9' into '21.9' · Jul 10, 2020

New candidate release for Phase 2 validation