Merge branch 'fix-ft' into to-merge