Closed spring-builds closed 2 weeks ago
Backport of gh-3608
Fixed via 73addc65efa922c33c7a03e2d6f2bda7b053892b
Backport of gh-3608