Merge "Removing PARAMS macro for consistency"