And we also need to update the implementation to use vals instead of hard-coded strings.
[Github] Pull Request #6277 (mengxr)