Merge "Portal Spring Boot Development"