Merge "Uplift of springboot framework"