TESTBOX-110 #resolve
Remove CF7,8 incompatibilities