Merge pull request 'Remove legacy references to FE that is not officially supported...