Merge "Fix sonar issues in portal"