Francesca Pastore authored Nov 29, 2023 and Vakhtang Tsulaia committed Nov 29, 2023

Fix ControlFlow for CA migration (ATR-28476 and ATR-28542)