Merge "Revert "Revert "Fully support static encoded fields."""