Merge "Fix Sonar Issues for BRMSGW"