Round 2 of #46269 with conflicts properly resolved. This came up a few times across various extensions. With us about to ship a new API version soon, it might be worth to add. Release Notes: - N/A --------- Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com>