Merge "BugFix: 500 Server error when upgrade and service restart with data in DB"