Merge branch 'freebasic-ft-update'