t660 fix for formula display with question and answer leakage stop
Merge branch 't660' into resolved