Today
merge back fix for static field code gen.