Bug 1082494 - Multiple issues in FTE
Merge pull request #25128 from anefzaoui/bug-1082494

Bug 1082494 - Multiple issues in FTE