Try a different approach for #63330 that will actually return results.
Merge branch 'master' into ascraeus