Bug 915061 - Refactor FTU