audit many formulas
Merge branch 'master' into develop