Merge pull request #4104 from m-martin-78/xfhsupport