Merge "Sonar Issue Fix - PORTAL-487"