Fixed invalid label value if StringExpression evalutes to an empty string
Removed commented line
Fixed merge conflict