Merge "Fixed string literal comparision issue"