master
Cleanup as suggested
resolve conflicts after PR 44765
Apply DescriptionCloner to modules generating multiple cfi
address issue 33373