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

Cfi fixes for72x (this is combining the 71X PRs #4405 and #4413 for 72X - now that we no longer forward port)