Closed spring-builds closed 5 months ago
Backport of gh-9129
Fixed via 882685df1f9d0a86027721538c2de3a7872e905d
Backport of gh-9129