Summary

We should take advantage of https://github.com/spring-projects/spring-framework/issues/23513