Update to FBA 0.2.97.31
Merge branch 'v029731'