Merge "Enterprise string clean-up for O"