Merge "refactor(twed): improve TWED enablement in EL-3" into integration