Merge branch 'ft_rework'