Merge "Added fix for string comparison reported in sonar"