Merge "Migrated to springboot 2.6.2"