Merge "[Manual] Fix static field names"