More defensive code around FT update
upped app version
Merge branch 'newdev' into test