Merge "Add missing field init in constructors"