Merge "Changes for testing CalculatorFormula" into ub-calculator-euler