Re #6524 Fix issue with incompatible files