Fixes for FTF configuration updates (!25037 (merged)) in standalone jO and legacy athena.
Fixes ATR-20144