Merge "Reinstate Spring Boot 3.0 after revert"