Merge "Spring-boot config upgrade"