Merge "Add string prefix optimization"