Merge "Added EXTRA_FORMULAS to proper pipeline definitions"