Merge "Added EXTRA_FORMULAS to lab params"