Gh 1108

This is for https://github.com/spring-projects/spring-boot/issues/1108