Merge branch 'ft-no-fc' into 'master'