Merge "Fill resolved static fields during class initialization"