Bug 916826 - FTU refactor