[v12.x] Backport n api 6 to v12.x #32482
+719
−37
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.