Merge "Sonar Issue Fix - PORTAL-486"