Merge "Adds support for array string extra."