Merge "Don't directly set parent class fields"