Merge "Add class member definition for params"