I realize I already bumped earlier today as well but wanted to
additionally include #1407 and #1408 for downstream integrations.