Fix: ODFOREA-509 and TOGAF-26