Cfi file fixes for 72X
Merge pull request #4448 from Martin-Grunewald/CfiFixesFor72X

Cfi file fixes for 72X (same as already for 71X: #4405 and #4413)