Merge "Remove redundant parameters from fullFieldsCalc"