Merge "Migrate CPS to Spring-boot 3.0"