Port 'run3-ideal_FT_update' into 'sim11/run5-ideal'

Include omitted FT conditions for sim10/run3-ideal

See merge request !120 (merged)

(cherry picked from commit 52929601)

91a30bd6 rebase 89e80f96 Automatic fixes