Maintenance
Merge conflict on TextHelper.cs
Service