Merge "Migrate to stringValue()"