CAL-668 fix build test failure reduce critical sonar issue
CAL-668 merge fix branch
UI-2815: Incorrect UI of Search Result Suggestion
Merge remote-tracking branch 'origin/master' into feature/centralized-workspaces