Back-port issue for: https://github.com/spring-projects/spring-integration/issues/8800