Removing string concatenation for entities
Merge branch 'AGPUSH-566'