Merge "Uplift Spring Boot to 3.1.2"