t646 fixed the missing formulae
Merge branch 't646' into resolved