Merge "Fix remaining PortMapping sonar issues"