Merge "DR_SubService-Fixed String comparison"